Added one missing string

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

diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
index 049682673fce7866b130bdb64fb80db8de2a4f67..295e1f8a4a36837ad2313bf789b35a48fefedb99 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2009-10-05 15:19+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -23,57 +23,6 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Basis"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filter"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -82,8 +31,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -123,7 +72,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -206,7 +155,7 @@ msgstr ""
 "erhalten, wenn Sie das Objekt einfügen!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Speichern"
@@ -254,7 +203,7 @@ msgstr ""
 "Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
 "Größenbeschränkung liegen"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Setzen"
@@ -263,22 +212,22 @@ msgstr "Setzen"
 msgid "Assigned ACL for current entry"
 msgstr "Zugewiesene ACL für aktuellen Eintrag"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "Neue ACL"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "ACL-Typ"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Wählen Sie einen ACL-Typ"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -304,7 +253,7 @@ msgstr "Verfügbare Mitglieder"
 msgid "List message possible targets"
 msgstr "Zeige mögliche Empfänger dieser Nachricht"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -312,7 +261,7 @@ msgstr "Mitglieder"
 msgid "List message recipients"
 msgstr "Zeige Nachrichtenempfänger"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Liste verfügbarer ACL-Kategorien"
 
@@ -359,127 +308,6 @@ msgstr "Passwort ändern"
 msgid "Click here to change your password"
 msgstr "Hier klicken, um Ihr Passwort zu ändern"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Liste der Abteilungen"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-msgid "Domain"
-msgstr "Domain"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Domänen-Komponente"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Land"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Standort"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organisation"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Abteilung"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Aktionen"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Bearbeiten"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Ihre GOsa-Sitzung wurde geschlossen!"
@@ -526,10 +354,10 @@ msgstr ""
 "gewählte Drucker noch existiert."
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Objekt"
 
@@ -576,8 +404,8 @@ msgstr "Grund für das Erzeugen dieses Snapshots"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Fortsetzen"
 
@@ -586,17 +414,17 @@ msgstr "Fortsetzen"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -607,18 +435,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -626,11 +460,17 @@ msgstr "Fortsetzen"
 msgid "Error"
 msgstr "Fehler"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Information"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -778,20 +618,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-msgid "Filter"
-msgstr "Filter"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -824,7 +650,7 @@ msgstr "GOsa Hauptmenü"
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
@@ -849,8 +675,8 @@ msgstr "Die GOsa-Konfigurationsdatei %s/%s ist nicht lesbar. Abgebrochen."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -861,7 +687,7 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr "Passwort-Methode"
 
@@ -890,10 +716,10 @@ msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -956,31 +782,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1130,9 +956,9 @@ msgstr "Der Filter ist unvollständig!"
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1145,14 +971,14 @@ msgstr "Berechtigung"
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
@@ -1206,143 +1032,153 @@ msgstr ""
 "Die Snapshot-Funktionalität ist aktiviert, aber das erforderliche Modul '%s' "
 "ist nicht verfügbar. Bitte installieren Sie '%s'."
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Zugriffskontrolle"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Zugriffskontrolllisten verwalten"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Alle Kategorien"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "ACLs zurücksetzen"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Diese Ebene"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Aktuelles Objekt"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Vollständiger Teilbaum"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Vollständiger Teilbaum (permanent)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Benutzer"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Auf"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Ab"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr "Keine ACL-Einstellungen für diese Kategorie!"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Enthält ACLs für diese Objekte: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "ACL Kategorie"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "ACL für '%s' bearbeiten - Gültigkeitsbereich ist '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Alle Objekte im aktuellen Teilbaum"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr "Zeige/verstecke erweiterte Einstellungen"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 msgid "Grant permission to owner"
 msgstr "Berechtigungen für Eigentümer einräumen"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "lesen"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "schreiben"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr "Vollständiges Objekt"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1354,154 +1190,142 @@ msgstr "Vollständiges Objekt"
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Unbekannter ACL-Typ '%s'!"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Unbekannter Eintrag '%s'!"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr "Rolle: %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr "unbekannte rolle"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr "inaktiv"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "No members"
 msgstr "Keine Mitglieder"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr "Zugriffskontrollliste"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr "ACL-Rollen"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Schliessen"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
+"Administrator."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Alle auswählen"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:519
+msgid "created by"
+msgstr "Angelegt von"
+
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Übertragen"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr "Inkonsistente Enkodierung der DN erkannt: '%s'"
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
-"Administrator."
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr "Wählen Sie eine Basis"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Alle auswählen"
-
-#: include/class_listing.inc:521
-msgid "created by"
-msgstr "Angelegt von"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Aktionen"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
@@ -1587,7 +1411,7 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Konfigurieren"
 
@@ -1836,6 +1660,42 @@ msgstr "Snapshot entfernen."
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Beschreibung"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -1939,13 +1799,13 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1954,29 +1814,29 @@ msgstr ""
 "Sie sicher, dass niemand wichtige Änderungen vorgenommen hat, die verloren "
 "gehen, wenn Sie diesen Eintrag speichern!"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr "Ändere ACL dn"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "von"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "an"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "Kopieren"
 
@@ -2020,308 +1880,308 @@ msgstr "in Zeile"
 msgid "XML error"
 msgstr "XML-Fehler"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Auswählen um Objekte des Typs '%s' aufzulisten."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Wählen Sie dies um Objekte aufzulisten die '%s' enthalten."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Auswählen um Objekte des Typs '%s' aufzulisten"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "Dieses objekt wird gelöscht!"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "Dieses '%s'-Objekt wird gelöscht!"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Dieses Objekt wird gelöscht: %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "Dieses '%s'-Objekt wird gelöscht: %s"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Dieses Objekt wird gelöscht:"
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "Dieses '%s'-Objekt wird gelöscht:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Diese Objekte werden gelöscht: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Diese '%s'-Objekte werden gelöscht: %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu löschen!"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu löschen:"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "Sie sind nicht berechtigt dieses Objekte zu löschen:"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "Sie sind nicht berechtigt diese Objekt anzulegen!"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "Sie sind nicht berechtigt dieses Objekt anzulegen:"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "Sie sind nicht berechtigt diese Objekte anzulegen:"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu verändern!"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu verändern:"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "Sie sind nicht berechtigt diese Objekte zu verändern:"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu öffnen!"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu öffnen:"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "Sie sind nicht berechtigt diese Objekte zu öffnen:"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu verschieben!"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "Sie sind nicht berechtigt dieses Objekt zu verschieben:"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "Sie sind nicht berechtigt diese Objekte zu verschieben:"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Verbindungs-Information"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Kann keine Verbindung zur %s Datenbank aufbauen!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "Kann die Datenbank %s nicht auswählen!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "Kein Server für %s definiert!"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "Kann die Datenbank %s nicht abfragen!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Das Feld '%s' enthält ein reserviertes Schlüsselwort!"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "'%s'-Kommando ist ungültig!"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "'%s' Kommando (%s) für Modul %s ist ungültig!"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "'%s' Kommando für Modul %s ist ungültig!"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "'%s' Kommando (%s) ist ungültig!"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Kann '%s' Kommando nicht ausführen!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "Kann '%s' Kommando (%s) für Modul %s nicht ausführen!"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Kann '%s' Kommando für Modul %s nicht ausführen!"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Kann '%s' Kommando (%s) nicht ausführen!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Der Wert für '%s' ist zu groß!"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' muß kleiner sein als %s!"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Der Wert für '%s' ist zu kein!"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' muß größer oder gleich %d sein!"
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hängt von '%s' ab - bitte geben Sie beide Werte an!"
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Es existiert bereits ein Eintrag mit diesem '%s' Attribut im System!"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Das Pflicht-Feld '%s' ist leer!"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Beispiel"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Das Feld '%s' enthält ungültige Zeichen"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' ist nicht erlaubt:"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' sind nicht erlaubt!"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Das Feld '%s' enthält ungültige Zeichen!"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr "%s einstellen"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr "%s bearbeiten..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Zurück"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2329,7 +2189,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2338,7 +2198,7 @@ msgstr ""
 "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, "
 "müssen Sie zunächst die %s Einstellungen entfernen!"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2346,7 +2206,7 @@ msgstr ""
 "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
 "einen Klick auf die Schaltfläche aktivieren."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2355,184 +2215,184 @@ msgstr ""
 "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu "
 "aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr "%s Einstellungen hinzufügen"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr "%s Einstellungen entfernen"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
 "Dialog zu ändern"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Januar"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Februar"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "März"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "April"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Mai"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Juni"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Juli"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "August"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "September"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Oktober"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "November"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Dezember"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Montag"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Samstag"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr "MySQL-Operation fehlgeschlagen!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr "Lese-Operation"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr "Hinzufügeoperation"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr "Änderungs-Operation"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr "Lösch-Operation"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr "Such-Operation"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr "Authentifizierung"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s fehlgeschlagen!"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr "LDAP-Operation fehlgeschlagen"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr "Übertragung fehlgeschlagen!"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Übertragung fehlgeschlagen: %s"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieses Objekts: %s"
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Dieses '%s' ist noch in Benutzung."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieser Objekte: %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -2541,32 +2401,32 @@ msgstr ""
 "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
 "prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -2575,6 +2435,12 @@ msgstr ""
 "Die Klasse '%s' kann nicht initialisiert werden! Vielleicht fehlt ein Modul "
 "in Ihren GOsa-Einstellungen?"
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+"Die angegebene Basis ist ungültig. Der alte Wert wurde wieder hergestellt!"
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Leistungswarnung"
@@ -2746,12 +2612,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Allgemein"
@@ -2802,18 +2668,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Gruppe"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Abteilung"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2918,19 +2797,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2960,25 +2839,72 @@ msgstr "Benutzer"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Basis"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filter"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 msgid "Show department"
 msgstr "Zeige Abteilungen"
@@ -3022,7 +2948,7 @@ msgstr ""
 "Daten wiederherzustellen."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Objektgruppen"
 
@@ -3044,87 +2970,87 @@ msgstr "Vorlagen"
 msgid "Windows Install"
 msgstr "Windows Installation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 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:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr "Windows-Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -3133,20 +3059,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:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 msgid "Sytem trust"
 msgstr "System-Vertrauen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr "Mitglied"
 
@@ -3165,36 +3091,19 @@ msgstr "Name der Gruppe"
 msgid "Descriptive text for this group"
 msgstr "Beschreibender Text für diese Gruppe"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Wählen Sie eine Basis"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "System-Vertrauen"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
@@ -3330,6 +3239,12 @@ msgstr "Objektgruppe löschen"
 msgid "Select objects to add"
 msgstr "Wählen Sie die hinzuzufügenden Objekte"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filter"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Zeige die Objekte der Abteilung"
@@ -3385,16 +3300,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Vorname"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Nachname"
 
@@ -3409,47 +3324,47 @@ msgstr "Mehrfach bearbeiten"
 msgid "Posix name of the group"
 msgstr "UNIX-Name der Gruppe"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Erzwinge GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Erzwungene ID-Nummer"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Auswählen, um eine sambakonforme Gruppe zu erzeugen"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "in der Domain"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Mitglieder sind in einer Telefon-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Mitglieder sind in einer Nagios-Gruppe"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Gruppenmitglieder"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "In allen Gruppen"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "Nicht in allen Gruppen"
 
@@ -3468,74 +3383,90 @@ msgstr "Zeige Samba Gruppen"
 msgid "Show mail groups"
 msgstr "Zeige Mail Gruppen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Gruppen-Einstellungen"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste der Gruppen"
+
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
+msgstr "Gruppe bearbeiten"
+
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
+msgstr "Gruppe löschen"
+
+#: plugins/admin/groups/class_group.inc:162
 msgid "Cannot find group SID in your configuration!"
 msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, 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:547
+#: plugins/admin/groups/class_group.inc:546
 #, 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:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr "! unbekannte UID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, 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:892
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kann keine SID für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kann keine RIDBASE für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, 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:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3543,46 +3474,30 @@ msgstr "Die Gruppen ID-Nummer '%s' wird bereits von %s verwendet!"
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr "Gesprächs-Annahme Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Gruppen-Einstellungen"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Liste der Gruppen"
-
-#: plugins/admin/groups/group-list.xml:138
-msgid "Edit group"
-msgstr "Gruppe bearbeiten"
-
-#: plugins/admin/groups/group-list.xml:151
-msgid "Remove group"
-msgstr "Gruppe löschen"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
@@ -3851,6 +3766,49 @@ msgstr ""
 "haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
 "Vorgang abzubrechen."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste der Abteilungen"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+msgid "Domain"
+msgstr "Domain"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Domänen-Komponente"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Land"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr "Standort"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organisation"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3869,36 +3827,27 @@ msgstr "Name des zu erzeugenden Standortes"
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Administrative Einstellungen"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
 
@@ -3916,7 +3865,7 @@ msgstr "Beschreibender Text zu dieser Abteilung"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Kategorie"
@@ -3926,75 +3875,75 @@ msgstr "Kategorie"
 msgid "Category for this subtree"
 msgstr "Kategorie dieses Teilbaums"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Land"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Land, in dem dieser Teilbaum anzusiedeln ist"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Ort dieses Teilbaums"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Postalische Anschrift dieses Teilbaums"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Einleitende Telefonnummer dieses Teilbaums"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Einleitende Fax-Nummer dieses Teilbaums"
 
@@ -4007,8 +3956,8 @@ msgid "Domain Component"
 msgstr "Domänen-Komponente"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Abteilungen"
 
@@ -4031,7 +3980,7 @@ msgid "Organization name"
 msgstr "Organisationsname"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Adresse"
 
@@ -4056,44 +4005,44 @@ msgstr "Name der zu erzeugenden Domäne"
 msgid "Name of country to create"
 msgstr "Name des anzulegenden Landes"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr "Kann keinen unbenutzten Tag für diese administrative Einheit finden!"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markiere '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verschiebe '%s' nach '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Fehler beim kopieren von %s, breche ab"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Objekt '%s' ist bereits markiert"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Entferne Markierung von Objekt '%s'"
@@ -4159,7 +4108,7 @@ msgid "ACL Templates"
 msgstr "ACL Vorlagen"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr "Rollen für die Zugriffskontrolle"
 
@@ -4167,52 +4116,52 @@ msgstr "Rollen für die Zugriffskontrolle"
 msgid "Edit AC roles"
 msgstr "ACL-Rollen bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "ACL zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "Keine ACL-Einstellungen für diese Kategorie"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "Enthält ACL für diese Objekte: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr "ACL Kategorie bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr "ACL-Kategorie zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr "Objekt in Verwendung"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Die Rolle kann nicht entfernt werden, solange sie noch von folgenden "
 "Objekten verwendet wird:"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Rolle"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -4244,29 +4193,29 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Organisationsbezogene Benutzereinstellungen bearbeiten"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Bitte eine einzelne IP-Adresse oder eine Netzwerk/Netzmasken Kombination "
 "hinzufügen!"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "männlich"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr "Kann Datei nicht hochladen!"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4274,232 +4223,232 @@ msgstr ""
 "(Manche Zertifikate werden momentan nicht unterstützt und werden daher als "
 "'ungültig' angezeigt)."
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Zertifkat ist gültig im Zeitraum von %s bis %s (momentan: %s)."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr "Die RDN kann nicht erstellt werden: + ist in sub RDNs nicht erlaubt!"
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Kann RDN nicht erstellen: Attribut ist nicht definiert!"
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr "Kann RDN nicht erstellen: ungültige Attribut-Parameter!"
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr "Die gewählte Passwort-Methode benötigt eine initiale Konfiguration!"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr "Kann Zertifikat nicht öffnen!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mein Konto"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 msgid "User password method"
 msgstr "Benutzer Passwort-Methode"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
@@ -4532,66 +4481,69 @@ msgstr "Name der Vorlage"
 msgid "Preferred langage"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Privat-Telefon"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr "Anmeldung beschränken"
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr "IP oder Netzwerk"
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Wählen Sie eine Basis"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Benutzer-Einstellungen"
@@ -5182,6 +5134,10 @@ msgstr "Nach der Migration"
 msgid "Migrate"
 msgstr "Migrieren"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Schliessen"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6683,3 +6639,15 @@ msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
 msgid "Automatic"
 msgstr "Automatisch"
 
+#~ msgid "Inconsistent DN encoding detected: '%s'"
+#~ msgstr "Inkonsistente Enkodierung der DN erkannt: '%s'"
+
+#~ msgid "Choose a base"
+#~ msgstr "Wählen Sie eine Basis"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr ""
+#~ "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"

diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
index 2bea88f7777a3c271dedc6864d085647a75258fe..d0b89741bbf0f2612bcabc3bce4c8767233f80fd 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2010-01-28 23:21+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
@@ -18,57 +18,6 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Base"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtros"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -77,8 +26,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -118,7 +67,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -199,7 +148,7 @@ msgstr ""
 "¡tendrá errores al pegar el objeto!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Guardar"
@@ -247,7 +196,7 @@ msgstr ""
 "ignore este error y muestre todas las entradas que coincidan con el tamaño "
 "limite definido y active el uso de filtros en su lugar"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Activar"
@@ -256,22 +205,22 @@ msgstr "Activar"
 msgid "Assigned ACL for current entry"
 msgstr "Asignando ACL a la entrada actual"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "Nueva ACL"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "Tipo de ACL"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Seleccione un tipo de ACL"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -297,7 +246,7 @@ msgstr "Miembros disponibles"
 msgid "List message possible targets"
 msgstr "Mostrar mensaje de posibles destinos"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Miembros"
 
@@ -305,7 +254,7 @@ msgstr "Miembros"
 msgid "List message recipients"
 msgstr "Lista de recipientes de mensajes"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Lista de categorías ACL disponibles"
 
@@ -352,127 +301,6 @@ msgstr "Cambiar contraseña"
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista de Departamentos"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-msgid "Domain"
-msgstr "Dominio"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Componente 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:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "País"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Localidad"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organización"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Departamento"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Descripción"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Acciones"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editar"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "¡Su sesión de GOsa se ha terminado!"
@@ -518,10 +346,10 @@ msgstr ""
 "existen las impresoras seleccionadas?"
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Objeto"
 
@@ -567,8 +395,8 @@ msgstr "Razón para generar esta instantánea"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Continuar"
 
@@ -577,17 +405,17 @@ msgstr "Continuar"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -598,18 +426,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -617,11 +451,17 @@ msgstr "Continuar"
 msgid "Error"
 msgstr "Error"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Información"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -766,20 +606,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-msgid "Filter"
-msgstr "Filtro"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -812,7 +638,7 @@ msgstr "Menú inicial de GOsa"
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr "Error fatal"
 
@@ -837,8 +663,8 @@ msgstr "No se puede acceder a la configuración de GOsa %s/%s. Cancelado"
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Error de configuración"
 
@@ -847,7 +673,7 @@ msgstr "Error de configuración"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr "Metodo de contraseña"
 
@@ -876,10 +702,10 @@ msgstr "La nueva contraseña es demasiado corta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -941,31 +767,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1120,9 +946,9 @@ msgstr "¡El filtro está incompleto!"
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1135,14 +961,14 @@ msgstr "Permiso"
 msgid "Permission error"
 msgstr "Error de Permisos"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -1195,143 +1021,153 @@ msgstr ""
 "La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
 "de compresión requerido. Por favor instale '%s'."
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Control de acceso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gestión de las Listas de control de acceso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Un nivel"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Utilizar las ACL definidas en el rol"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuarios"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Editar"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr "¡No hay ACL configuradas para esta categoría!"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Tiene ACLs para estos objetos: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "Categoría ACL"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/ocultar caracteristicas avanzadas"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Eliminar Objetos"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 msgid "Grant permission to owner"
 msgstr "Garantizar permiso al propietario"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "leer"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "escribir"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr "Objeto completo"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1343,153 +1179,141 @@ msgstr "Objeto completo"
 msgid "Internal error"
 msgstr "error interno"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "¡Tipo de ACL desconocido '%s'!"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "¡Entrada desconocida '%s'!"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr "Rol: %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr "rol desconocido"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Tiene configuraciones de los siguientes objetos: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr "inactivo"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "No members"
 msgstr "Sin miembros"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr "Lista de control de acceso"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr "Roles ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Cerrar"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Seleccione todos"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:519
+msgid "created by"
+msgstr "Creado por"
+
+#: include/class_listing.inc:988
 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:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Enviar"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr "Se ha detectado una codificación de DN inconsistente: '%s'"
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr "Elija una base"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Seleccione todos"
-
-#: include/class_listing.inc:521
-msgid "created by"
-msgstr "Creado por"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Acciones"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -1576,7 +1400,7 @@ msgstr ""
 "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
 "si se supera el límite máximo"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Configurar"
 
@@ -1826,6 +1650,42 @@ msgstr "Eliminar instantanea"
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descripción"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -1929,13 +1789,13 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1943,29 +1803,29 @@ msgstr ""
 "Este objeto ha cambiado desde que ha sido abierto en GOsa. ¡Todos los "
 "cambios realizados por otros se perderán si graba esta entrada!"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "desde"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "a"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "mover"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "copiar"
 
@@ -2009,308 +1869,308 @@ msgstr "En linea"
 msgid "XML error"
 msgstr "Error XML"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Seleccione para mostrar objetos de tipo '%s'."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Seleccione para mostrar objetos conteniendo '%s'."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Seleccione para buscar dentro de subárboles"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "¡El objeto será eliminado!"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "¡El objeto '%s' será eliminado!"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Este objeto será eliminado: %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "El objeto '%s' será eliminado: %s"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Este objeto será eliminado"
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "El objeto '%s' será eliminado:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Estos objetos serán eliminados: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Los objetos '%s' serán eliminados: %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "¡No tiene permisos para eliminar este objeto!"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "No tiene permisos para eliminar este objeto:"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "No tiene permisos para eliminar estos objetos:"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "¡No tiene permisos para crear este objeto!"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "No tiene permisos para crear este objeto:"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "No tiene permisos para crear estos objetos:"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "¡No tiene permisos para modificar este objeto!"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "No tiene permisos para modificar este objeto:"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "No tiene permisos para modificar estos objetos:"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "¡No tiene permisos para ver este objeto!"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "No tiene permisos para ver el objeto:"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "No tiene permisos para ver estos objetos:"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "¡No tiene permisos para mover este objeto!"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "No tiene permisos para mover el objeto:"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "No tiene permisos para mover estos objetos:"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Información de conexión"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "¡No se puede conectar a la base de datos %s!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "¡No se puede seleccionar la base de datos %s!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "¡No se ha definido el servidor %s!"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "¡No se ha podido ejecutar la consulta %s!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "¡El campo '%s' tiene una palabra reservada!"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "¡El comando especificado como método %s para la extensión '%s' no existe!"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "¡El comando '%s' no es válido!"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "¡'%s' comando (%s) para la extensión %s no es válido!"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "¡'%s' comando para la extensión %s no es válido!"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "¡'%s' comando (%s) no es válido!"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "¡No se puede ejecutar el comando '%s'!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "¡No se puede ejecutar el comando '%s' (%s) para la extensión %s!"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "¡No se puede ejecutar el comando '%s' para la extensión %s!"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "¡No se puede ejecutar el comando '%s' (%s)!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "¡El valor especificado como '%s' es demasiado grande!"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "¡'%s' debe ser menor que %s!"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "¡El valor especificado como '%s' es demasiado pequeño!"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "¡'%s' debe ser %d o superior!"
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Ejemplo"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "El campo '%s' tiene caracteres no validos."
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "¡El campo '%s' tiene caracteres no validos!"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr "Activar %s"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Atrás"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2318,7 +2178,7 @@ msgstr ""
 "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
 "aquí"
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2327,7 +2187,7 @@ msgstr ""
 "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
 "necesita eliminar las caracteristicas %s primero!"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2335,7 +2195,7 @@ msgstr ""
 "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
 "aquí"
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2344,183 +2204,183 @@ msgstr ""
 "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
 "necesita añadir las caracteristicas %s primero!"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Pulse en el botón - Editar - para cambiar la información en esta ventana"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Enero"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Febrero"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Marzo"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Abril"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Mayo"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Junio"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Julio"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Agosto"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Septiembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Octubre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Noviembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Diciembre"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr "¡La consulta MYSQL ha fallado!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr "lectura"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr "adición"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -2529,32 +2389,32 @@ msgstr ""
 "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
 "el archivo de configuración!"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -2563,6 +2423,11 @@ msgstr ""
 "¡No se puede inicializar la clase '%s'! ¿Puede que falte la extensión "
 "correspondiente en la configuración de GOsa?"
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
@@ -2732,12 +2597,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el problema y actualize la página."
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Genérico"
@@ -2788,18 +2653,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Grupo"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departamento"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2904,19 +2782,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2946,25 +2824,72 @@ msgstr "Usuario"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filtro"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 msgid "Show department"
 msgstr "Mostrar departamento"
@@ -3008,7 +2933,7 @@ msgstr ""
 "de que GOsa pueda recuperar posteriormente esa información"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
@@ -3030,87 +2955,87 @@ msgstr "Plantillas"
 msgid "Windows Install"
 msgstr "Instalación Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 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:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "¡demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "impresoras"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "No existe el 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -3119,19 +3044,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:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr "Grupo de objetos genérico"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 msgid "Sytem trust"
 msgstr "Sistema de confianza"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr "Miembro"
 
@@ -3150,36 +3075,19 @@ msgstr "Nombre del grupo"
 msgid "Descriptive text for this group"
 msgstr "Descripción del grupo"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Elija el subárbol donde colocar el grupo"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Seleccione una base"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Objetos miembros"
 
@@ -3315,6 +3223,12 @@ msgstr "Eliminar grupo de objetos"
 msgid "Select objects to add"
 msgstr "Seleccione los objetos a añadir"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtros"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Mostrar objetos del departamento"
@@ -3370,16 +3284,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Nombre de pila"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Apellido"
 
@@ -3394,48 +3308,48 @@ msgstr "Edición multiple"
 msgid "Posix name of the group"
 msgstr "Nombre Posix del grupo"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalmente los IDs son generados automáticamente, seleccione para indicar "
 "manualmente"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Forzar número ID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Seleccione para crear un grupo conforme samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "en dominio"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Los miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Los miembros están en un grupo Nagios"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Miembros del grupo"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "en todos los grupos"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "no en todos los grupos"
 
@@ -3454,72 +3368,88 @@ msgstr "Mostrar grupos de samba"
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Parametros de grupos"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
+msgstr "Editar grupo"
+
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
+msgstr "Eliminar grupo"
+
+#: plugins/admin/groups/class_group.inc:162
 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:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, 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:547
+#: plugins/admin/groups/class_group.inc:546
 #, 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:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr "¡UID desconocido!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, 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:892
+#: plugins/admin/groups/class_group.inc:894
 #, 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:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "¡No se puede encontrar un RIDBASE para '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, 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:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3527,46 +3457,30 @@ msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %s!"
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr "Miembros de grupo de salto telefónico"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr "Miembro del grupo"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Parametros de grupos"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
-
-#: plugins/admin/groups/group-list.xml:138
-msgid "Edit group"
-msgstr "Editar grupo"
-
-#: plugins/admin/groups/group-list.xml:151
-msgid "Remove group"
-msgstr "Eliminar grupo"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Administración de grupo"
@@ -3703,7 +3617,8 @@ msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:655, php-format
+#: plugins/admin/users/class_userManagement.inc:655
+#, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
@@ -3835,6 +3750,49 @@ msgstr ""
 "actual de su árbol LDAP en un fichero. Entonces - Y solo entonces - presione "
 "'Eliminar' para continuar o 'Cancelar' para abortar."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista de Departamentos"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+msgid "Domain"
+msgstr "Dominio"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Componente del dominio"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "País"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr "Localidad"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: 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:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organización"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3853,36 +3811,27 @@ msgstr "Nombre de la localidad a crear"
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Elija subárbol para colocar el departamento"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Parámetros administrativos"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Marcar departamento como una unidad administrativa independiente"
 
@@ -3900,7 +3849,7 @@ msgstr "Descripción del departamento"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Categoría"
@@ -3910,75 +3859,75 @@ msgstr "Categoría"
 msgid "Category for this subtree"
 msgstr "Categoría para este subárbol"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Estado donde está este subárbol localizado"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Localización de este subárbol"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Dirección postal de este subárbol"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Número base de teléfono de este subárbol"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subárbol"
 
@@ -3991,8 +3940,8 @@ msgid "Domain Component"
 msgstr "Componentes del dominio"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -4008,15 +3957,14 @@ msgid ""
 msgstr ""
 "Tan pronto como la operación de etiquetado termine, puede avanzar hasta el "
 "final de la página y presionar el botón 'Continuar' para continuar al "
-"dialogo "
-"de gestión de departamento."
+"dialogo de gestión de departamento."
 
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr "Nombre de la Organización"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Código Postal"
 
@@ -4041,46 +3989,46 @@ msgstr "Nombre del dominio a crear"
 msgid "Name of country to create"
 msgstr "Nombre del país a crear"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
 "administrativa!"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Etiquetando '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Moviendo '%s' a '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Ha fallado a copiar %s, operación abortada"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Nombre de departamento"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "El objeto '%s' está ya marcado"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Añadir marca (%s) al objeto '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Eliminando marca del objeto '%s'"
@@ -4143,7 +4091,7 @@ msgid "ACL Templates"
 msgstr "Plantillas ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr "Roles de control de acceso"
 
@@ -4151,52 +4099,52 @@ msgstr "Roles de control de acceso"
 msgid "Edit AC roles"
 msgstr "Editar roles CA"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "Eliminar ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr "Eliminar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr "Objeto en uso"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Este Rol no puede ser eliminado por estar siendo usado por los siguientes "
 "objetos:"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Rol"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -4228,27 +4176,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editar parámetros de usuarios administrativos"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr "¡Por favor añada una IP única o una combinación red/mascara!"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr "¡No se puede subir el archivo!"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Número serie"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4256,233 +4204,233 @@ msgstr ""
 "(Algunos tipos de certificados no están soportados y pueden ser mostrados "
 "como no validos.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "El certificado es valido desde %s hasta %s y es actualmente %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "no válido"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr "El método de contraseña seleccionado no está disponible."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr "No se puede construir RDN: ¡no se permite + para construir subRDN!"
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "No se puede construir RDN: ¡Atributo no definido!"
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr "No se puede construir RDN: ¡Valor no válido del atributo!"
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 "¡El método de contraseña seleccionado necesita una configuració inicial!"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última dirección conocida"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lugar de residencia"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de desarrollo"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Función"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible por todos"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Títulos académicos"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Funciones laborales"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 msgid "User password method"
 msgstr "Metodo de contraseña de usuario"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
@@ -4515,66 +4463,69 @@ msgstr "Nombre de la plantilla"
 msgid "Preferred langage"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Elija el subárbol donde colocar al usuario"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Almacén de claves"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr "Restringir inicio de sesión a"
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr "IP o Red"
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Por favor use la sección telefóno"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Elija el subárbol donde colocar al usuario"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Seleccione una base"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Caracteristicas del usuario"
@@ -5162,6 +5113,10 @@ msgstr "Despues de migrar"
 msgid "Migrate"
 msgstr "Migrar"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Cerrar"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6639,6 +6594,18 @@ msgstr "Este paso le permite seleccionar su idioma preferido"
 msgid "Automatic"
 msgstr "Automatico"
 
+#~ msgid "Inconsistent DN encoding detected: '%s'"
+#~ msgstr "Se ha detectado una codificación de DN inconsistente: '%s'"
+
+#~ msgid "Choose a base"
+#~ msgstr "Elija una base"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Elija el subárbol donde colocar el grupo"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "Elija subárbol para colocar el departamento"
+
 #~ msgid "Update"
 #~ msgstr "Actualizar"
 

diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index a8861c43af4e65e7daafa54a55dab0155ac49c1a..fcc1e8d5ad314b6b451e1b8867792d3591e0cb53 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2010-01-28 22:18+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -14,57 +14,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr ""
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtres"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -73,8 +22,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -114,7 +63,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -197,7 +146,7 @@ msgstr ""
 "nouveau !"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Enregistrer"
@@ -247,7 +196,7 @@ msgstr ""
 "au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
 "restreindre les données a visualiser"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Activer"
@@ -256,22 +205,22 @@ msgstr "Activer"
 msgid "Assigned ACL for current entry"
 msgstr "ACL assignés à l'entrée actuelle"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "Nouvelle ACL"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "Type ACL"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Sélectionnez un type d'acl"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -297,7 +246,7 @@ msgstr "Membres disponibles"
 msgid "List message possible targets"
 msgstr "Liste les destinataires possibles pour les messages"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Membres"
 
@@ -305,7 +254,7 @@ msgstr "Membres"
 msgid "List message recipients"
 msgstr "Lister les destinataires du message"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Liste des catégories d'acl disponibles"
 
@@ -352,127 +301,6 @@ msgstr "Modifier le mot de passe"
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Liste des départements"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-msgid "Domain"
-msgstr "Domaine"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Composant domaine"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Pays"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Lieu"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Entreprise"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Département"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editer"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Votre session GOsa à expiré !"
@@ -518,10 +346,10 @@ msgstr ""
 "est ce que l'imprimante sélectionnée existe encore ?"
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Objet"
 
@@ -568,8 +396,8 @@ msgstr "Raison pour la génération de cette copie instantanée"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Continuer"
 
@@ -578,17 +406,17 @@ msgstr "Continuer"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -599,18 +427,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -618,11 +452,17 @@ msgstr "Continuer"
 msgid "Error"
 msgstr "Erreur"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Information"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -769,20 +609,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-msgid "Filter"
-msgstr "Filtre"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -815,7 +641,7 @@ msgstr "Menu Principal de GOsa"
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
@@ -840,8 +666,8 @@ msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -852,7 +678,7 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation est "
 "inaccessible !"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
@@ -880,10 +706,10 @@ msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -899,7 +725,8 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: html/password.php:249
 msgid "External password changer reported a problem: "
-msgstr "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
+msgstr ""
+"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
 #: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
@@ -946,31 +773,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -990,7 +817,8 @@ msgstr "Erreur LDAP"
 
 #: html/index.php:265
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr "Impossible de détecter les information sur les schémas LDAP installés !"
+msgstr ""
+"Impossible de détecter les information sur les schémas LDAP installés !"
 
 #: html/index.php:278
 msgid "Your LDAP setup contains old schema definitions:"
@@ -1033,7 +861,8 @@ msgstr "Smarty"
 #: html/main.php:148
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
+msgstr ""
+"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
 
 #: html/main.php:167
 msgid "PHP configuration"
@@ -1057,7 +886,8 @@ msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
 
 #: html/main.php:339
 msgid "Your password is about to expire, please change your password!"
-msgstr "Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
+msgstr ""
+"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
 
 #: html/main.php:349
 msgid "Plugin"
@@ -1119,9 +949,9 @@ msgstr "Le filtre est incomplet !"
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1134,14 +964,15 @@ msgstr "Permissions"
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
-msgstr "Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
+msgstr ""
+"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
@@ -1151,7 +982,9 @@ msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr "Pas de déclaration pour '%s' dans votre fichier de configuration. Impossible d'initialiser le plugin !"
+msgstr ""
+"Pas de déclaration pour '%s' dans votre fichier de configuration. Impossible "
+"d'initialiser le plugin !"
 
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
@@ -1192,143 +1025,153 @@ msgstr ""
 "La fonctionnalité pour les copie instantanées est activée, mais le module "
 "nécessaire à la compression est manquant. Veuillez installer '%s'. "
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Contrôle d'accès"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gestion de listes de contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Toutes les catégories"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "Remise à zéro des ACL"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Un niveau"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Objet actuel"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Sous arbre complet"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Le sous arbre complet (permanent)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Au dessus"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "En bas"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Editer"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr ""
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr "Pas de paramètres pour les ACL de cette catégorie !"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contient les ACL pour ces objets: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "ACL de la catégorie"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Tout les objets dans le sous arbres actuel"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr "Afficher/Cacher la configuration avancée"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Créer un objet"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Bouger un objet"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Enlever les objets"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 msgid "Grant permission to owner"
 msgstr "Donner la permission à l'utilisateur"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "lecture"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "écrire"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr "L'objet au complet"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1340,154 +1183,142 @@ msgstr "L'objet au complet"
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Type d'ACL inconnu '%s' !"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrée inconnue '%s'  !"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr "Rôle : %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr "Rôle inconnu"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contient les paramètres pour ces objets: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr "inactif"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "No members"
 msgstr "Aucun membres"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr "Contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr "Rôles ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Fermer"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
+"système."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Sélectionner tout"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:519
+msgid "created by"
+msgstr "Crée par"
+
+#: include/class_listing.inc:988
 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:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Soumettre"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr "Encodage du inconsistant du DN détecté : '%s'"
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
 msgstr ""
-"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
-"système."
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr "Sélectionnez une base"
 
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Sélectionner tout"
-
-#: include/class_listing.inc:521
-msgid "created by"
-msgstr "Crée par"
-
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
@@ -1508,7 +1339,8 @@ msgstr ""
 
 #: include/functions.inc:134
 #, php-format
-msgid "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
 "'%s' pour essayer de régler le problème"
@@ -1522,7 +1354,8 @@ msgstr ""
 
 #: include/functions.inc:519
 msgid "Username / UID is not unique inside the LDAP tree!"
-msgstr "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
+msgstr ""
+"Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
 
 #: include/functions.inc:604
 msgid ""
@@ -1572,7 +1405,7 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Configurer"
 
@@ -1738,7 +1571,8 @@ msgstr "Russe"
 
 #: include/functions.inc:3022
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
@@ -1749,7 +1583,8 @@ msgstr "Impossible de générer un hash samba !"
 
 #: include/functions.inc:3068
 #, php-format
-msgid "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
+msgid ""
+"Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 "Impossible de générer le mot de passe samba: l'exécution de '%s' à échoué, "
 "veuillez vérifier le paramètre 'sambaHashHook'!"
@@ -1821,6 +1656,42 @@ msgstr "Supprimer le snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr ""
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1927,13 +1798,13 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1941,29 +1812,29 @@ msgstr ""
 "Cet objet à changer depuis son ouverture dans GOsa. Tout les changement "
 "éffectués par les autres seront perdus si vous sauvez cette entrée !"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "vers"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "couper"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "copier"
 
@@ -2007,316 +1878,318 @@ msgstr "en ligne"
 msgid "XML error"
 msgstr "Erreur XML"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Sélectionnez pour lister les objets de type '%s'."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Sélectionner pour lister les objets contenant '%s'."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Sélectionnez pour lister les objets qui ont '%s' activés"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Sélectionner pour chercher dans le sous arbre"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "Cet objet sera effacé !"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "L'objet '%s' sera effacé !"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Cet objet sera effacé : %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "L'objet de type '%s' sera effacé: %s"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Cet objet sera effacé: "
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "L'objet de type '%s' sera effacé:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Ces objets seront effacés: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Ces objets de type '%s' seront effacés: %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet !"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer cet objet :"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "Vous n'avez pas les droits nécessaires pour supprimer ces objets :"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "Vous n'avez pas les droits nécessaires pour créer cet objet !"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "Vous n'avez pas les droits nécessaires pour créer l'objet :"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "Vous n'avez pas les droits nécessaires pour créer ces objets :"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "Vous n'avez pas l'autorisation de modifier cet objet !"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "Vous n'avez pas l'autorisation de modifier cet objet :"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "Vous n'avez pas l'autorisation de modifier ces objets :"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "Vous n'avez pas l'autorisation de voir cet objet !"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "Vous n'avez pas l'autorisation de voir l'objet :"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "Vous n'avez pas l'autorisation devoir ces objets :"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "Vous n'avez pas l'autorisation de bouger cet objet !"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "Vous n'avez pas l'autorisation de bouger l'objet :"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "Vous n'avez pas l'autorisation de bouger ces objets :"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Informations de connexions"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Impossible de se connecter à la base de données %s !"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "Impossible de sélectionner la base de données %s !"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "Pas de serveur %s défini !"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "Impossible d'effectuer une requête sur la base de données %s !"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Le champ '%s' contient un mot réservé !"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "La commande '%s', spécifiée comme connexion de l'extension '%s' n'existe "
 "pas !"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Le commande '%s' est invalide !"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "l'option '%s' de la commande (%s) pour l'extension %s est invalide !"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "l'option '%s' de la commande pour l'extension %s est invalide !"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "l'option '%s' de la commande (%s) est invalide !"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Impossible d'exécuter la commande '%s' !"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
-msgstr "Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
+msgstr ""
+"Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Impossible d'exécuter l'option '%s' de la commande (%s) !"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "La valeur pour '%s' est trop grande !"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' doit être plus petit que %s !"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "La valeur pour '%s' est trop petite !"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' doit être à la version %d ou plus grand !"
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dépend de '%s' - veuillez indiquer les deux valeurs !"
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Il existe déjà une entrée avec l'attribut '%s' dans le système !"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Le champ obligatoire '%s' n'est pas rempli !"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Exemple"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Le champ '%s' contient des caractères invalides"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' n'est pas permis :"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' n'est pas autorisé !"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Le champ '%s' contient des caractères invalides !"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr "Ajouter %s"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr "Supprimer %s"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr "Activer %s"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr "Editer..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr "Editer %s..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Retour"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Ce compte n'a pas d'extensions %s valides !"
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
-msgid "This account has %s settings enabled. You can disable them by clicking below."
+msgid ""
+"This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
 "cliquant sur le bouton ci-dessous."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2325,14 +2198,15 @@ msgstr ""
 "Ce compte possède %s paramètres activés. Pour le désactiver vous devez au "
 "préalable supprimer les %s paramètres !"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
-msgid "This account has %s settings disabled. You can enable them by clicking below."
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 "Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
 "clicquant ci dessous."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2341,184 +2215,184 @@ msgstr ""
 "Ce compte possède %s paramètres désactivés. Pour les activer, vous devez au "
 "préalable ajouter les %s paramètres !"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr "Ajouter %s paramètres"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr "Effacer %s paramètres"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
 "cette boite de dialogue"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Janvier"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Février"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Mars"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Avril"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Mai"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Juin"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Juillet"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Août"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Septembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Octobre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Novembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Décembre"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr "La requête MySQL à échoué !"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr "lecture"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr "ajout"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr "modification"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr "recherche"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr "authentification"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La requête LDAP %s à échoué !"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr "La requête LDAP à échoué !"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr "Le téléchargement à échoué !"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Le téléchargement à échoué : %s"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr "Erreur de communication avec le service d'infrastructure !"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Erreur de communication avec le service d'infrastructure : %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Ce '%s' est en cours d'utilisation par : %s"
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Ce '%s' est toujours en utilisation."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Ce '%s' est en utilisation par les objets : %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -2527,32 +2401,32 @@ msgstr ""
 "La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
 "votre fichier de configuration !"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible d'effacer le fichier '%s' !"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible d'effacer le répertoire '%s' !"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support pour %s"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -2561,6 +2435,11 @@ msgstr ""
 "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
 "extension dans votre installation de GOsa ?"
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Avertissement de performance"
@@ -2574,7 +2453,8 @@ msgstr ""
 
 #: include/class_ldap.inc:692
 #, php-format
-msgid "Cannot automatically create subtrees with RDN '%s': no object class found!"
+msgid ""
+"Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 "Impossible de créer automatiquement des sous arbres avec le RDN '%s': object "
 "class non trouvé !"
@@ -2732,12 +2612,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Informations"
@@ -2788,18 +2668,31 @@ msgstr ""
 msgid "Group"
 msgstr "Groupes"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Département"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2905,19 +2798,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2947,25 +2840,72 @@ msgstr "Utilisateur"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr ""
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filtre"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 msgid "Show department"
 msgstr "Départements"
@@ -3010,7 +2950,7 @@ msgstr ""
 "données."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -3032,87 +2972,87 @@ msgstr "Modèles"
 msgid "Windows Install"
 msgstr "Installation Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 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:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "nombre d'objets différents trop important !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "groupes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "départements"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "serveurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "stations de travail"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr "Stations Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "terminaux"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "imprimantes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "désactivé"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "accès complet"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "le dn n'existe pas :"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -3121,19 +3061,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:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 msgid "Sytem trust"
 msgstr "Système de Confiance"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr "Membres"
 
@@ -3152,36 +3092,19 @@ msgstr "Nom du groupe"
 msgid "Descriptive text for this group"
 msgstr "Description du groupe"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Sélectionnez la branche où sera placée le groupe"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Système de Confiance"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Objets membres"
 
@@ -3317,6 +3240,12 @@ msgstr "Enlever le groupe d'objet"
 msgid "Select objects to add"
 msgstr "Sélectionnez les objets à ajouter"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtres"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Afficher les objets du département"
@@ -3373,16 +3302,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Prénom"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Nom de famille"
 
@@ -3397,48 +3326,48 @@ msgstr "Edition multiple"
 msgid "Posix name of the group"
 msgstr "Nom posix du groupe"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalement les IDs sont générés automatiquement, vous pouvez en spécifier "
 "un manuellement"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forcer le GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Forcer le numéro d'ID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Sélectionnez afin de créer un groupe samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "dans le domaine"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Les membres sont dans un groupe téléphonique"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Les membres sont dans un groupe nagios"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Membre du groupe"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "dans tout les groupes"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "pas dans tout les groupes"
 
@@ -3457,72 +3386,89 @@ msgstr "Groupes Samba"
 msgid "Show mail groups"
 msgstr "Groupes de messagerie"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Préférences des groupes"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste des groupes"
+
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
+msgstr "Editer le groupe"
+
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
+msgstr "Enlever le groupe"
+
+#: plugins/admin/groups/class_group.inc:162
 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:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, 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:547
+#: plugins/admin/groups/class_group.inc:546
 #, 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:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr "! identifiant inconnu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr "La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
+msgstr ""
+"La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossible de trouver le SID pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossible de trouver le RIDBASe pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, 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:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3530,46 +3476,30 @@ msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr "Domaine Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr "Groupe téléphonique"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr "Groupe Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr "Membre du groupe"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Préférences des groupes"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Liste des groupes"
-
-#: plugins/admin/groups/group-list.xml:138
-msgid "Edit group"
-msgstr "Editer le groupe"
-
-#: plugins/admin/groups/group-list.xml:151
-msgid "Remove group"
-msgstr "Enlever le groupe"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Administration du groupe"
@@ -3841,6 +3771,49 @@ msgstr ""
 "fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
 "continuer ou 'Annuler' pour abandonner."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste des départements"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+msgid "Domain"
+msgstr "Domaine"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Composant domaine"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Pays"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr "Lieu"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Entreprise"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3859,38 +3832,27 @@ msgstr "Nom du lieu à créer"
 msgid "Descriptive text for department"
 msgstr "Description du département"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr ""
-"Sélectionnez la branche de l'annuaire dans laquelle sera placée le "
-"département"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Paramètres administratifs"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Marquer le département comme une entité administrative indépendante"
 
@@ -3908,7 +3870,7 @@ msgstr "Description du département"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Catégorie"
@@ -3918,75 +3880,75 @@ msgstr "Catégorie"
 msgid "Category for this subtree"
 msgstr "Catégorie pour cette branche de l'annuaire"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Département"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Lieu où est située cette branche de l'annuaire"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Lieu de cette branche"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Adresse"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Adresse postale de cette branche"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Numéro de téléphone de base pour cette sous-branche"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Numéro de fax de base pour cette sous-branche"
 
@@ -3999,8 +3961,8 @@ msgid "Domain Component"
 msgstr "Objet Domaine"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Départements"
 
@@ -4023,7 +3985,7 @@ msgid "Organization name"
 msgstr "Nom de l'entreprise"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Adresse postale"
 
@@ -4048,46 +4010,46 @@ msgstr "Nom du domaine à créer"
 msgid "Name of country to create"
 msgstr "Nom du pays à créer"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "Impossible de trouver un marqueur libre pour marquer l'entité "
 "administrative !"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Marquer '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Impossible de copier %s, arrêt de l'opération"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "L'objet '%s' est déjà marqué"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Ajouter une marque (%s) à l'objet '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Suppression de la marque de l'objet '%s'"
@@ -4150,7 +4112,7 @@ msgid "ACL Templates"
 msgstr "Modèles des ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr "Contrôle d'accès (ACL)"
 
@@ -4158,50 +4120,51 @@ msgstr "Contrôle d'accès (ACL)"
 msgid "Edit AC roles"
 msgstr "Editer le rôles (ACL)"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "Remise à zéro des ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "Pas d'ACL pour cette catégorie"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL pour ces objets: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr "Editer les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr "Remettre à zéro les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr "Objet utilisé"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr "Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
+msgstr ""
+"Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -4233,29 +4196,29 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editer les paramètres organisationnels de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Veuillez ajouter une adresse IP ou une combinaison réseau/masque de sous "
 "réseau !"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "féminin"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "masculin"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr "Impossible de télécharger le fichier !"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Numéro de série"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4263,238 +4226,239 @@ msgstr ""
 "(Certains types de certificats ne sont pas supportés et peuvent être "
 "affichés comme 'non valides'.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Le certificat est valide de %s à %s et est actuellement %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "valide"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "invalide"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr ""
 "Le format de stockage sélectionné pour les mots de passe n'est plus "
 "disponible."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 "Impossible de construire le RDN: pas de + autorisé dans la construction d'un "
 "sous RDN !"
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Impossible de construire un RDN: l'attribut n'est pas défini !"
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 "Imposible de contruire un RDN: les paramètres de l'attribut sont non "
 "valides !"
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
-msgstr "Le format de stockage sélectionné nécessite une configuration de base !"
+msgstr ""
+"Le format de stockage sélectionné nécessite une configuration de base !"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat !"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mon Compte"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 msgid "User password method"
 msgstr "Méthode d'encodage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
@@ -4527,66 +4491,69 @@ msgstr "Nom du modèle"
 msgid "Preferred langage"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Editer des certificats"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr "Restreindre le login à"
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr "IP ou réseau"
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Sélectionnez une base"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Préférences utilisateur"
@@ -4886,7 +4853,8 @@ msgstr "Paramètres Posix"
 
 #: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
-msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
 #: plugins/personal/posix/posix_shadow.tpl:34
 msgid "Password expires on"
@@ -4928,7 +4896,8 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/class_password.inc:85
 msgid "The password you've entered as 'New password' is empty."
-msgstr "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+msgstr ""
+"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
 
 #: plugins/personal/password/class_password.inc:94
 #, php-format
@@ -4959,7 +4928,8 @@ msgstr "Le changement du mot de passe n'est pas autorisé"
 
 #: plugins/personal/password/nochange.tpl:6
 msgid "You have no permission to change your password at this time"
-msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
+msgstr ""
+"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
 
 #: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
@@ -5030,7 +5000,8 @@ msgid "Please specify a valid email address."
 msgstr "Veuillez indiquer une adresse de messagerie valide."
 
 #: setup/class_setupStep_Feedback.inc:184
-msgid "You have to select at least one of both options, subscribe or send feedback."
+msgid ""
+"You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
 "Vous devez au moins avoir activé une option, souscrire ou envoyer votre "
 "retour d'information."
@@ -5178,6 +5149,10 @@ msgstr "Après migration"
 msgid "Migrate"
 msgstr "Migrer"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Fermer"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -5422,7 +5397,8 @@ msgstr "Vérification de l'installation"
 
 #: setup/class_setupStep_Checks.inc:40
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Vérification de base de la version de PHP et des extensions nécéssaires."
+msgstr ""
+"Vérification de base de la version de PHP et des extensions nécéssaires."
 
 #: setup/class_setupStep_Checks.inc:64
 msgid "Checking PHP version"
@@ -5465,14 +5441,16 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "GOsa requires this module to handle unicode strings."
-msgstr "GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
+msgstr ""
+"GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "MySQL"
 msgstr "MySQL"
 
 #: setup/class_setupStep_Checks.inc:121
-msgid "GOsa requires this module to communicate with several supported databases."
+msgid ""
+"GOsa requires this module to communicate with several supported databases."
 msgstr ""
 "GOsa à besion de ce module pour dialoguer avec les bases de données "
 "supportées."
@@ -5488,7 +5466,8 @@ msgstr ""
 "mots de passe Samba."
 
 #: setup/class_setupStep_Checks.inc:140
-msgid "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
+msgid ""
+"Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 "Déployez une installation gosa-si ou installer les modules perl Crypt::"
 "Smbash."
@@ -5574,7 +5553,8 @@ msgstr ""
 "mémoire pour les installations plus complexes."
 
 #: setup/class_setupStep_Checks.inc:209
-msgid "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 "Recherchez pour 'memory_limit' dans votre php.ini et mettez le à '32M' or "
 "plus haut."
@@ -5596,7 +5576,8 @@ msgid "The Execution time should be at least 30 seconds."
 msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
 #: setup/class_setupStep_Checks.inc:225
-msgid "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
 "'30' ou plus."
@@ -5638,7 +5619,8 @@ msgstr ""
 "'off'."
 
 #: setup/class_setupStep_Checks.inc:249
-msgid "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+msgid ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
 "mettez la à 'Off'."
@@ -5973,7 +5955,8 @@ msgstr "Sélectionner un utilisateur"
 
 #: setup/setup_ldap.tpl:86
 msgid "Automatically append LDAP base to admin DN"
-msgstr "Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
+msgstr ""
+"Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
 
 #: setup/setup_ldap.tpl:93
 msgid "Admin password"
@@ -6105,7 +6088,8 @@ msgstr "Echec"
 
 #: setup/class_setupStep_Migrate.inc:375
 #, php-format
-msgid "Found %s winstations outside the predefined winstation department ou '%s'."
+msgid ""
+"Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 "J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
 "s'."
@@ -6126,8 +6110,10 @@ msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
 #: setup/class_setupStep_Migrate.inc:586 setup/class_setupStep_Migrate.inc:599
 #, php-format
-msgid "The specified user '%s' does not have full access to your ldap database."
-msgstr "L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr ""
+"L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
 
 #: setup/class_setupStep_Migrate.inc:663
 #, php-format
@@ -6156,7 +6142,8 @@ msgstr "Compte administratifs de GOsa 2.5 trouvés : %s"
 
 #: setup/class_setupStep_Migrate.inc:1033
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
-msgstr "Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
+msgstr ""
+"Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
 
 #: setup/class_setupStep_Migrate.inc:1050
 msgid "There is no GOsa administrator account inside your LDAP."
@@ -6193,7 +6180,8 @@ msgstr "Le nom d'utilisateur est incorrect !"
 #: setup/class_setupStep_Migrate.inc:1200
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
+msgstr ""
+"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -6223,7 +6211,8 @@ msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
 #: setup/class_setupStep_Migrate.inc:1990
-msgid "The LDAP root object is missing. It is required to use your LDAP service."
+msgid ""
+"The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre "
 "annuaire LDAP."
@@ -6443,7 +6432,8 @@ msgstr "Compresser les données envoyées au navigateur web"
 
 #: setup/setup_config1.tpl:27
 msgid "People and group storage"
-msgstr "Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
+msgstr ""
+"Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
 
 #: setup/setup_config1.tpl:30
 msgid "People DN attribute"
@@ -6656,3 +6646,16 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 msgid "Automatic"
 msgstr "Automatique"
 
+#~ msgid "Inconsistent DN encoding detected: '%s'"
+#~ msgstr "Encodage du inconsistant du DN détecté : '%s'"
+
+#~ msgid "Choose a base"
+#~ msgstr "Sélectionnez une base"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Sélectionnez la branche où sera placée le groupe"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr ""
+#~ "Sélectionnez la branche de l'annuaire dans laquelle sera placée le "
+#~ "département"

diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
index a177c4993edbbc66b4042e80ef495418db78785a..a612ceb7d745e8d78bd5079c6a3b3dd7942f5d0d 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -15,57 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Base"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtri"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -74,8 +23,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -113,7 +62,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -187,7 +136,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Salva"
@@ -229,7 +178,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Imposta"
@@ -238,25 +187,25 @@ msgstr "Imposta"
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 #, fuzzy
 msgid "New ACL"
 msgstr "Nuovo"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "ACL type"
 msgstr "Tipo"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Rimuovi"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -283,7 +232,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Membri"
 
@@ -291,7 +240,7 @@ msgstr "Membri"
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Scegli il tuo numero di telefono personale"
@@ -345,130 +294,6 @@ msgstr "Cambia la password"
 msgid "Click here to change your password"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista dei dipartimenti"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "nel dominio"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Amministratori di Dominio"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Paese"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Località"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organizzazione"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Dipartimento"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Descrizione"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Azioni"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Modifica"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -504,10 +329,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Oggetto"
 
@@ -548,8 +373,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Continua"
 
@@ -558,17 +383,17 @@ msgstr "Continua"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -579,18 +404,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -598,11 +429,17 @@ msgstr "Continua"
 msgid "Error"
 msgstr ""
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Informazioni"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -739,21 +576,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Filtri"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -785,7 +607,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal Server"
@@ -811,8 +633,8 @@ msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -822,7 +644,7 @@ msgstr "File di configurazione"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "Password method"
 msgstr "Algorimo password"
@@ -850,10 +672,10 @@ msgstr "La 'Nuova password' immessa è troppo corta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -912,31 +734,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1085,9 +907,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 #, fuzzy
@@ -1102,14 +924,14 @@ msgstr "Permessi"
 msgid "Permission error"
 msgstr "Permessi"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
@@ -1154,157 +976,167 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 #, fuzzy
 msgid "Access control"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 #, fuzzy
 msgid "All categories"
 msgstr "Aggiungi contatto"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 #, fuzzy
 msgid "Current object"
 msgstr "Password attuale"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 #, fuzzy
 msgid "Complete subtree"
 msgstr "incompleto"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utenti"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Modifica"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 #, fuzzy
 msgid "category ACL"
 msgstr "classe"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Opzioni di posta avanzate"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 #, fuzzy
 msgid "Create objects"
 msgstr "Gruppo di oggetti"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 #, fuzzy
 msgid "Move objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 #, fuzzy
 msgid "Remove objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Rimuovi"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "leggere"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "scrivere"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 #, fuzzy
 msgid "Complete object"
 msgstr "Gruppo di oggetti"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1317,170 +1149,156 @@ msgstr "Gruppo di oggetti"
 msgid "Internal error"
 msgstr "Terminal Server"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Ruolo"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "inactive"
 msgstr "Privato"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Membri del gruppo"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 #, fuzzy
 msgid "Access control list"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
 #, fuzzy
-msgid "Close"
-msgstr "Scegli"
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+#, fuzzy
+msgid "Select all"
+msgstr "Rimuovi"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "Creare"
+
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Root"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Sali di dipartimento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
-
-#: include/class_baseSelectDialog.inc:28
-#, fuzzy
-msgid "Choose a base"
-msgstr "Rimuovi"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-#, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "Creare"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Azioni"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 #, fuzzy
 msgid "Copy"
 msgstr "Azienda"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 #, fuzzy
 msgid "Cut"
 msgstr "Esegui"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 #, fuzzy
 msgid "Export list"
 msgstr "Esporta"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Gruppo di oggetti"
@@ -1558,7 +1376,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Configura"
 
@@ -1802,6 +1620,42 @@ msgstr "Crea estensioni di posta"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descrizione"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1908,46 +1762,46 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argomenti"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "Seleziona per mostrare le applicazioni"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 #, fuzzy
 msgid "from"
 msgstr "e"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 #, fuzzy
 msgid "Restore"
 msgstr "Riprova"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr ""
 
@@ -1992,330 +1846,330 @@ msgstr "Continua"
 msgid "XML error"
 msgstr "Errore LDAP"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, fuzzy, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Gruppo di oggetti"
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, fuzzy, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Mostra gruppi che contengono utenti"
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, fuzzy, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Gruppo di oggetti"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #, fuzzy
 msgid "Select to search within subtrees"
 msgstr "Seleziona per mostrare le applicazioni"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 #, fuzzy
 msgid "You have no permission to delete this object!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 #, fuzzy
 msgid "You have no permission to delete the object:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 #, fuzzy
 msgid "You have no permission to delete these objects:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 #, fuzzy
 msgid "You have no permission to create this object!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 #, fuzzy
 msgid "You have no permission to create the object:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 #, fuzzy
 msgid "You have no permission to create these objects:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 #, fuzzy
 msgid "You have no permission to modify this object!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 #, fuzzy
 msgid "You have no permission to modify the object:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 #, fuzzy
 msgid "You have no permission to modify these objects:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 #, fuzzy
 msgid "You have no permission to view this object!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 #, fuzzy
 msgid "You have no permission to view the object:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 #, fuzzy
 msgid "You have no permission to view these objects:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 #, fuzzy
 msgid "You have no permission to move this object!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 #, fuzzy
 msgid "You have no permission to move the object:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 #, fuzzy
 msgid "You have no permission to move these objects:"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 #, fuzzy
 msgid "Connection information"
 msgstr "Informazioni personali"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, fuzzy, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Impossibile connettersi al server del database!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, fuzzy, php-format
 msgid "Cannot select %s database!"
 msgstr "Impossibile selezionare il database!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, fuzzy, php-format
 msgid "Cannot query %s database!"
 msgstr "Impossibile selezionare il database!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, fuzzy, php-format
 msgid "'%s' command is invalid!"
 msgstr "Il valore specificato per l'UID non è valido."
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, fuzzy, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "Il valore specificato per l'UID non è valido."
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Impossibile selezionare il database!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Impossibile selezionare il database!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, fuzzy, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Il valore specificato per l'UID è troppo basso."
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "PHP deve essere la versione 4.1.0 o superiore."
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, fuzzy, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Il valore specificato per l'UID è troppo basso."
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, fuzzy, php-format
 msgid "'%s' must be %d or above!"
 msgstr "PHP deve essere la versione 4.1.0 o superiore."
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, fuzzy, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Il campo necessario 'Home directory' non è vuoto"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "Cambia la password"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Elimina foto"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Aggiungi"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, fuzzy, php-format
 msgid "Add %s"
 msgstr "Aggiungi"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, fuzzy, php-format
 msgid "Delete %s"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, fuzzy, php-format
 msgid "Set %s"
 msgstr "Imposta"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit..."
 msgstr "Modifica"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit %s..."
 msgstr "Modifica contatto"
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Indietro"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Questa identità non possiede estensioni GOsa."
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr "Questa identià possiede estensioni Unix."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2324,13 +2178,13 @@ msgstr ""
 "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
 "le estensioni Samba / ambiente."
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr "Questa identità non possiede estensioni Unix"
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2339,232 +2193,237 @@ msgstr ""
 "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
 "le estensioni Samba / ambiente."
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "Opzioni applicazione"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Impostazioni Unix"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
 "questo dialogo"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Gennaio"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Febbraio"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Marzo"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Aprile"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Maggio"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Giugno"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Luglio"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Agosto"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Settembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Ottobre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Novembre"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Dicembre"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Sunday"
 msgstr "Cognome"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Monday"
 msgstr "mese"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "La query al database è fallita!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "read operation"
 msgstr "Opzioni di posta"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "modify operation"
 msgstr "Informazioni personali"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "delete operation"
 msgstr "Selezione le workstation da aggiungere"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "search operation"
 msgstr "L'account spira dopo"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "authentication"
 msgstr "Destinazione"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "La query al database è fallita!"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "La query al database è fallita!"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 #, fuzzy
 msgid "Upload failed!"
 msgstr "Nome applicazione"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Utenti di Dominio"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "Nome descrittivo del gruppo"
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Vai al dipartimento base"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Controllo il supporto per iconv"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
@@ -2729,12 +2588,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Generale"
@@ -2785,18 +2644,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Gruppo"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Dipartimento"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2904,19 +2776,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2946,25 +2818,73 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtri"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -3014,7 +2934,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
@@ -3039,107 +2959,107 @@ msgstr "Template"
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "utenti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "gruppi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "applicazioni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "dipartimenti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 #, fuzzy
 msgid "winstations"
 msgstr "Amministrazione"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "telefoni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "stampanti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "disabilitato"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "accesso completo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 #, fuzzy
 msgid "Object group generic"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Accesso ai sistemi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 #, fuzzy
 msgid "Member"
 msgstr "Membri"
@@ -3159,37 +3079,19 @@ msgstr "Nome del gruppo"
 msgid "Descriptive text for this group"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Scegli il subtree dove mettere il gruppo"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-#, fuzzy
-msgid "Select a base"
-msgstr "Rimuovi"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Accesso ai sistemi"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Oggetti membri"
 
@@ -3342,6 +3244,12 @@ msgstr "server"
 msgid "Select objects to add"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtri"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr ""
@@ -3395,16 +3303,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Nome"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Cognome"
 
@@ -3419,50 +3327,50 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr "Nome Unix del gruppo"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalmente le ID sono autogenerate, selezionare per specificarelo "
 "manulamente"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forza GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Forza numero ID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Seleziona per creare un gruppo conforme Samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "nel dominio"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "I membri sono in un gruppo di risposta telefonica"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 #, fuzzy
 msgid "Members are in a nagios group"
 msgstr "I membri sono in un gruppo di risposta telefonica"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Membri del gruppo"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 #, fuzzy
 msgid "In all groups"
 msgstr "Gruppo primario"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 #, fuzzy
 msgid "Not in all groups"
 msgstr "Mostra gruppi di posta"
@@ -3483,68 +3391,87 @@ msgstr "Mostra gruppi samba"
 msgid "Show mail groups"
 msgstr "Mostra gruppi samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Impostazioni FAX"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dei gruppi"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "Gruppo primario"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "server"
+
+#: plugins/admin/groups/class_group.inc:162
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Amministratori di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Ospiti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3552,55 +3479,36 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 #, fuzzy
 msgid "Samba group type"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Home di Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "I membri sono in un gruppo di risposta telefonica"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 #, fuzzy
 msgid "Nagios group"
 msgstr "Contatto"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 #, fuzzy
 msgid "Group member"
 msgstr "Membri del gruppo"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Impostazioni FAX"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista dei gruppi"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "Gruppo primario"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "server"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Amministrazione dei gruppi di utenti"
@@ -3881,6 +3789,52 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dei dipartimenti"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "nel dominio"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Amministratori di Dominio"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Paese"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "Località"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organizzazione"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -3900,37 +3854,28 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 #, fuzzy
 msgid "Administrative settings"
 msgstr "Amministrazione"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -3949,7 +3894,7 @@ msgstr "Nome descrittivo del gruppo"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -3959,75 +3904,75 @@ msgstr ""
 msgid "Category for this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Località"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Stato"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Indirizzo"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
@@ -4041,8 +3986,8 @@ msgid "Domain Component"
 msgstr "Amministratori di Dominio"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Dipartimenti"
 
@@ -4064,7 +4009,7 @@ msgid "Organization name"
 msgstr "Organizzazione"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "CAP"
 
@@ -4091,45 +4036,45 @@ msgstr ""
 msgid "Name of country to create"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 #, fuzzy
 msgid "Department name"
 msgstr "Dipartimento"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Telefono"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4190,7 +4135,7 @@ msgid "ACL Templates"
 msgstr "Template"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 #, fuzzy
 msgid "Access control roles"
 msgstr "Opzioni di accesso"
@@ -4200,55 +4145,55 @@ msgstr "Opzioni di accesso"
 msgid "Edit AC roles"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Rimuovi"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "classe"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "classe"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy
 msgid "Object in use"
 msgstr "Nome dell'oggetto"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Ruolo"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 #, fuzzy
 msgid "Permissions"
 msgstr "Permessi"
@@ -4283,273 +4228,273 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "femmina"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "maschio"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 #, fuzzy
 msgid "Serial number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "valido"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "invalido"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Non ci sono certificati installati"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Identità"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titolo di studio"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sesso"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificato standard"
@@ -4584,66 +4529,70 @@ msgstr "Template"
 msgid "Preferred langage"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Scegli il subtree per l'utente"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Telefono privato"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificati"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Modifica certificati"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Matricola"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Usa il tab del telefono"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Scegli il subtree per l'utente"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+#, fuzzy
+msgid "Select a base"
+msgstr "Rimuovi"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 #, fuzzy
 msgid "User settings"
@@ -5285,6 +5234,11 @@ msgstr "Amministrazione utenti"
 msgid "Migrate"
 msgstr "Creare"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+#, fuzzy
+msgid "Close"
+msgstr "Scegli"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6800,6 +6754,13 @@ msgstr "Lingua preferita"
 msgid "Automatic"
 msgstr "automatico"
 
+#, fuzzy
+#~ msgid "Choose a base"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Scegli il subtree dove mettere il gruppo"
+
 #, fuzzy
 #~ msgid "Show %s"
 #~ msgstr "Mostra gruppi"

diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index a4074dfbd5df591005408d93728b110fa988d90a..38e549cd068053c0f650177f06bea9e1d21e9d65 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,57 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr ""
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -75,8 +24,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -111,7 +60,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -183,7 +132,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr ""
@@ -223,7 +172,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr ""
@@ -232,22 +181,22 @@ msgstr ""
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -273,7 +222,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr ""
 
@@ -281,7 +230,7 @@ msgstr ""
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr ""
 
@@ -328,127 +277,6 @@ msgstr ""
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-msgid "Domain"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr ""
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -483,10 +311,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr ""
 
@@ -525,8 +353,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr ""
 
@@ -535,17 +363,17 @@ msgstr ""
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -556,18 +384,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -575,11 +409,17 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr ""
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -709,20 +549,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-msgid "Filter"
-msgstr ""
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -753,7 +579,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr ""
 
@@ -778,8 +604,8 @@ msgstr ""
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr ""
 
@@ -788,7 +614,7 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr ""
 
@@ -814,10 +640,10 @@ msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -874,31 +700,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1037,9 +863,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1052,14 +878,14 @@ msgstr ""
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -1104,143 +930,153 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr ""
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr ""
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr ""
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr ""
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr ""
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1252,152 +1088,140 @@ msgstr ""
 msgid "Internal error"
 msgstr ""
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr ""
+
+#: include/class_listing.inc:519
+msgid "created by"
+msgstr ""
+
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr ""
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr ""
-
-#: include/class_listing.inc:521
-msgid "created by"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
 msgstr ""
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -1469,7 +1293,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr ""
 
@@ -1702,6 +1526,42 @@ msgstr ""
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr ""
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1802,41 +1662,41 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr ""
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr ""
 
@@ -1878,546 +1738,551 @@ msgstr ""
 msgid "XML error"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
 "the %s settings first!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
@@ -2574,12 +2439,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2630,18 +2495,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2741,19 +2619,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2783,25 +2661,72 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr ""
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 msgid "Show department"
 msgstr ""
@@ -2843,7 +2768,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr ""
 
@@ -2865,104 +2790,104 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr ""
 
@@ -2981,36 +2906,19 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr ""
 
@@ -3146,6 +3054,12 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr ""
@@ -3199,16 +3113,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr ""
 
@@ -3223,46 +3137,46 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr ""
 
@@ -3281,68 +3195,84 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:162
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3350,46 +3280,30 @@ msgstr ""
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr ""
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/group-list.xml:138
-msgid "Edit group"
-msgstr ""
-
-#: plugins/admin/groups/group-list.xml:151
-msgid "Remove group"
-msgstr ""
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr ""
@@ -3637,6 +3551,49 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+msgid "Domain"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr ""
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3655,36 +3612,27 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -3702,7 +3650,7 @@ msgstr ""
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -3712,75 +3660,75 @@ msgstr ""
 msgid "Category for this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
@@ -3793,8 +3741,8 @@ msgid "Domain Component"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr ""
 
@@ -3814,7 +3762,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr ""
 
@@ -3839,44 +3787,44 @@ msgstr ""
 msgid "Name of country to create"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -3933,7 +3881,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr ""
 
@@ -3941,50 +3889,50 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr ""
 
@@ -4014,258 +3962,258 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr ""
 
@@ -4298,66 +4246,69 @@ msgstr ""
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr ""
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr ""
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr ""
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr ""
@@ -4924,6 +4875,10 @@ msgstr ""
 msgid "Migrate"
 msgstr ""
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr ""
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""

diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
index 7766553c04f4c9afaf1bcf8ab8f7829839f1092f..bb503940e49363537623f02c9cc390e2ec914866 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -19,57 +19,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Basis"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filters"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -78,8 +27,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -119,7 +68,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -197,7 +146,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Opslaan"
@@ -244,7 +193,7 @@ msgstr ""
 "Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
 "grootte limiet en laat me daarvoor in de plaats filters gebruiken"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Stel in"
@@ -253,25 +202,25 @@ msgstr "Stel in"
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 #, fuzzy
 msgid "New ACL"
 msgstr "Nieuw"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "ACL type"
 msgstr "type"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Selecteer een basis"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -298,7 +247,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Groepsleden"
 
@@ -306,7 +255,7 @@ msgstr "Groepsleden"
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Lijst met beschikbare pakketten"
@@ -360,130 +309,6 @@ msgstr "Verander wachtwoord"
 msgid "Click here to change your password"
 msgstr "Klik hier om uw wachtwoord te veranderen."
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lijst met afdelingen"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "in domein"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Windows beheerders"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Land"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Plaats"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organisatie"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Afdeling"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Omschrijving"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Acties"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Bewerken"
-
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -520,10 +345,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Object"
 
@@ -566,8 +391,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Doorgaan"
 
@@ -576,17 +401,17 @@ msgstr "Doorgaan"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -597,18 +422,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -616,11 +447,17 @@ msgstr "Doorgaan"
 msgid "Error"
 msgstr "Fout"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Informatie"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -773,21 +610,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Filters"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -820,7 +642,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal server"
@@ -846,8 +668,8 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -858,7 +680,7 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
@@ -888,10 +710,10 @@ msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -950,31 +772,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1132,9 +954,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 #, fuzzy
@@ -1149,14 +971,14 @@ msgstr "Rechten"
 msgid "Permission error"
 msgstr "Rechten"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
@@ -1201,156 +1023,166 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 #, fuzzy
 msgid "Access control"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 #, fuzzy
 msgid "All categories"
 msgstr "Categorie toevoegen"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "One level"
 msgstr "Log prioriteit"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 #, fuzzy
 msgid "Current object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Subonderdelen negeren"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Gebruikers"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Omhoog"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Omlaag"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Bewerken"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "Rechten"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 #, fuzzy
 msgid "category ACL"
 msgstr "Categorie"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Geavanceerde telefoon instellingen"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 #, fuzzy
 msgid "Create objects"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 #, fuzzy
 msgid "Move objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 #, fuzzy
 msgid "Remove objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "alleen lezen"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 #, fuzzy
 msgid "Complete object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1363,166 +1195,153 @@ msgstr "Nieuw FAI object aanmaken"
 msgid "Internal error"
 msgstr "Terminal server"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Funktie"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 #, fuzzy
 msgid "unknown role"
 msgstr "! onbekend id"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "inactive"
 msgstr "actief"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 #, fuzzy
 msgid "Access control list"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 #, fuzzy
 msgid "ACL roles"
 msgstr "Rechten"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Sluiten"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+#, fuzzy
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+#, fuzzy
+msgid "Select all"
+msgstr "Selecteer"
+
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "Aanmaken"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Verwerk"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
-
-#: include/class_baseSelectDialog.inc:28
-#, fuzzy
-msgid "Choose a base"
-msgstr "Selecteer een basis"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "Aanmaken"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Acties"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 #, fuzzy
 msgid "Copy"
 msgstr "kopieer"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 #, fuzzy
 msgid "Cut"
 msgstr "knippen"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 #, fuzzy
 msgid "Export list"
 msgstr "Exporteer"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Nieuw FAI object aanmaken"
@@ -1605,7 +1424,7 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Instellen"
 
@@ -1856,6 +1675,42 @@ msgstr "Nagios account aanmaken"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Omschrijving"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1965,45 +1820,45 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "Zoek binnen subtree"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 #, fuzzy
 msgid "Restore"
 msgstr "Opnieuw proberen"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "knippen"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "kopieer"
 
@@ -2048,235 +1903,235 @@ msgstr "Doorgaan"
 msgid "XML error"
 msgstr "LDAP fout:"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, fuzzy, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Selecteer de toe te voegen objecten"
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, fuzzy, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Selecteer om groepen die gebruikers bevatten te tonen"
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, fuzzy, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Selecteer de toe te voegen objecten"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Selecteer om binnen subonderdelen te zoeken"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 #, fuzzy
 msgid "You have no permission to delete this object!"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 #, fuzzy
 msgid "You have no permission to delete the object:"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 #, fuzzy
 msgid "You have no permission to delete these objects:"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 #, fuzzy
 msgid "You have no permission to create this object!"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 #, fuzzy
 msgid "You have no permission to create the object:"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 #, fuzzy
 msgid "You have no permission to create these objects:"
 msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 #, fuzzy
 msgid "You have no permission to modify this object!"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 #, fuzzy
 msgid "You have no permission to modify the object:"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 #, fuzzy
 msgid "You have no permission to modify these objects:"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 #, fuzzy
 msgid "You have no permission to view this object!"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 #, fuzzy
 msgid "You have no permission to view the object:"
 msgstr ""
 "U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 #, fuzzy
 msgid "You have no permission to view these objects:"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 #, fuzzy
 msgid "You have no permission to move this object!"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 #, fuzzy
 msgid "You have no permission to move the object:"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 #, fuzzy
 msgid "You have no permission to move these objects:"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 #, fuzzy
 msgid "Connection information"
 msgstr "Persoonlijke informatie"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, fuzzy, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Kan niet verbinden met de database server!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, fuzzy, php-format
 msgid "Cannot select %s database!"
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, fuzzy, php-format
 msgid "Cannot query %s database!"
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, fuzzy, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, fuzzy, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
 "bestaat niet."
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, fuzzy, php-format
 msgid "'%s' command is invalid!"
 msgstr "De opgegeven naam is ongeldig."
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, fuzzy, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "De opgegeven naam is ongeldig."
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, fuzzy, php-format
 msgid "Value for '%s' is too large!"
 msgstr "De opgegeven 'UID' waarde is te klein."
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 "De waarde opgegeven voor 'shadowMin' moet kleiner zijn dan 'shadowMax'."
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, fuzzy, php-format
 msgid "Value for '%s' is too small!"
 msgstr "De opgegeven 'UID' waarde is te klein."
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, fuzzy, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
@@ -2284,94 +2139,94 @@ msgstr ""
 "functionaliteit die in voorgaande versies niet goed of helemaal niet "
 "voorhanden is."
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, fuzzy, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, fuzzy, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Verwijder printer mogelijkheden"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, fuzzy, php-format
 msgid "Add %s"
 msgstr "Toevoegen"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, fuzzy, php-format
 msgid "Delete %s"
 msgstr "Verwijderen"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, fuzzy, php-format
 msgid "Set %s"
 msgstr "Stel in"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit..."
 msgstr "Bewerken"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit %s..."
 msgstr "Bewerk gebruiker"
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Terug"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dit account heeft geen geldige GOsa extensies."
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2379,7 +2234,7 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden ingeschakeld. U kunt deze uitschakelen "
 "door de knop hieronder te gebruiken."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2388,7 +2243,7 @@ msgstr ""
 "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
 "moet u eerst het samba / omgevings account verwijderen."
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2396,7 +2251,7 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2405,232 +2260,237 @@ msgstr ""
 "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
 "moet u eerst het samba / omgevings account verwijderen."
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "Programma instellingen"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Posix instellingen"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
 "veranderen"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Januari"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Februari"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Maart"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "April"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Mei"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Juni"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Juli"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Augustus"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "September"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Oktober"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "November"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "December"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Sunday"
 msgstr "Achternaam"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Monday"
 msgstr "maand"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "read operation"
 msgstr "E-mail opties"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "modify operation"
 msgstr "Persoonlijke informatie"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "delete operation"
 msgstr "Selecteer om werkstations te zien"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "search operation"
 msgstr "Het account verloopt op"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "authentication"
 msgstr "Nagios authenticatie"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 #, fuzzy
 msgid "Upload failed!"
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Log DB gebruiker"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "Deze 'dn' is geen groep."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
@@ -2800,12 +2660,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Algemeen"
@@ -2856,18 +2716,31 @@ msgstr "Ftp"
 msgid "Group"
 msgstr "Groep"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Afdeling"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2974,19 +2847,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -3016,25 +2889,73 @@ msgstr "Gebruiker"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Basis"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filters"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -3086,7 +3007,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:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -3112,108 +3033,108 @@ msgstr "Sjabloon"
 msgid "Windows Install"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "programma's"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "afdelingen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "servers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 #, fuzzy
 msgid "winstations"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "volledige toegang"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "Niet bestaande dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 #, 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 #, fuzzy
 msgid "Object group generic"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 #, fuzzy
 msgid "Member"
 msgstr "Groepsleden"
@@ -3233,36 +3154,19 @@ msgstr "Naam van de groep"
 msgid "Descriptive text for this group"
 msgstr "Omschrijving voor deze groep"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
@@ -3413,6 +3317,12 @@ msgstr "servers"
 msgid "Select objects to add"
 msgstr "Selecteer de toe te voegen objecten"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filters"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Toon objecten van afdeling"
@@ -3468,16 +3378,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Naam"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Achternaam"
 
@@ -3492,49 +3402,49 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr "POSIX naam van de groep"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normaliter worden IDs automatisch gegenereerd. Selecteer om handmatig te "
 "specificeren"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forceer GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Geforceerd ID nummer"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Selecteer om een samba conforme groep te maken"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "in domein"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Leden zitten in een systeeminformatie groep (Nagios)"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Groepsleden"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 #, fuzzy
 msgid "In all groups"
 msgstr "Primaire groep"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 #, fuzzy
 msgid "Not in all groups"
 msgstr "Toon E-mail groepen"
@@ -3555,72 +3465,90 @@ msgstr "Toon Samba groepen"
 msgid "Show mail groups"
 msgstr "Toon Samba groepen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Groep instellingen"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lijst met groepen"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "Primaire groep"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "servers"
+
+#: plugins/admin/groups/class_group.inc:162
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 "Kan de SID van deze groep niet vinden in de LDAP database of in uw "
 "configuratie bestand."
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Windows beheerders"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Windows gasten"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! onbekend id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3628,54 +3556,36 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba home"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios account"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 #, fuzzy
 msgid "Group member"
 msgstr "Groepsleden"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Groep instellingen"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lijst met groepen"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "Primaire groep"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "servers"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Groepen beheer"
@@ -3962,6 +3872,52 @@ msgstr ""
 "alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
 "door te gaan of op 'Annuleren' om te annuleren."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lijst met afdelingen"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "in domein"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Windows beheerders"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Land"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "Plaats"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organisatie"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -3982,36 +3938,27 @@ msgstr "Naam van de aan te maken subtree"
 msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Administratieve instellingen"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
 
@@ -4030,7 +3977,7 @@ msgstr "Omschrijving voor de afdeling"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Categorie"
@@ -4040,75 +3987,75 @@ msgstr "Categorie"
 msgid "Category for this subtree"
 msgstr "Categorie voor deze subtree"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Provincie waar deze subtree zich bevindt"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Plaats van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Post adres van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Basis telefoonnummer van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Basis Fax nummer van deze subtree"
 
@@ -4122,8 +4069,8 @@ msgid "Domain Component"
 msgstr "Windows beheerders"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Afdelingen"
 
@@ -4145,7 +4092,7 @@ msgid "Organization name"
 msgstr "Organisatie"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Adres thuis"
 
@@ -4174,47 +4121,47 @@ msgstr "Naam van de aan te maken subtree"
 msgid "Name of country to create"
 msgstr "Naam van de aan te maken subtree"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
 "eenheid te markeren!"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markeren van '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Afdelingnaam"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Object '%s' is al gemarkeerd"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Toevoegen van markering (%s) aan object '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Verwijderen van markering van object '%s'"
@@ -4279,7 +4226,7 @@ msgid "ACL Templates"
 msgstr "Sjablonen"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 #, fuzzy
 msgid "Access control roles"
 msgstr "Toegangsopties"
@@ -4289,54 +4236,54 @@ msgstr "Toegangsopties"
 msgid "Edit AC roles"
 msgstr "Rechten"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Verwijderen"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Nieuw FAI object aanmaken"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Bewerk klasse"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Categorie"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy
 msgid "Object in use"
 msgstr "Objectnaam"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Funktie"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 #, fuzzy
 msgid "Permissions"
 msgstr "Rechten"
@@ -4371,274 +4318,274 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Programma instellingen"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "vrouw"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "man"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 #, fuzzy
 msgid "Serial number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "geldig"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "ongeldig"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mijn account"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
@@ -4672,66 +4619,69 @@ msgstr "Sjabloon naam"
 msgid "Preferred langage"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Bewerk certificaten"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Selecteer een basis"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
@@ -5371,6 +5321,10 @@ msgstr "Gebruikersbeheer"
 msgid "Migrate"
 msgstr "Aanmaken"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Sluiten"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6914,6 +6868,16 @@ msgstr ""
 msgid "Automatic"
 msgstr "automatisch"
 
+#, fuzzy
+#~ msgid "Choose a base"
+#~ msgstr "Selecteer een basis"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
+
 #, fuzzy
 #~ msgid "Show %s"
 #~ msgstr "Toon groepen"

diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
index 75bba2d429555cf4c509b854502fd6ff0264ac7f..05d4cba42ce44b6c19e647e3e199b029bff30668 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2009-09-05 15:13+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -14,57 +14,6 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Kontener"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtry"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -73,8 +22,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -113,7 +62,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -191,7 +140,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Zapisz"
@@ -237,7 +186,7 @@ msgstr ""
 "ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w "
 "zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Ustaw"
@@ -247,22 +196,22 @@ msgstr "Ustaw"
 msgid "Assigned ACL for current entry"
 msgstr "Przypisane ACL'e dla obecnego wpisu"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "Nowy ACL"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "typ ACL"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Wybierz typ ACL"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -289,7 +238,7 @@ msgstr "Dostępni członkowie"
 msgid "List message possible targets"
 msgstr "Wyświetl możliwe cele wiadomości"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Członkowie"
 
@@ -297,7 +246,7 @@ msgstr "Członkowie"
 msgid "List message recipients"
 msgstr "Wyświetl odbiorców wiadomości"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Lista dostępnych kategorii ACL"
 
@@ -347,130 +296,6 @@ msgstr "Zmień hasło"
 msgid "Click here to change your password"
 msgstr "Kliknij tutaj aby zmienić swoje hasło"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista departamentów"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "w domenie"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Administratorzy domeny"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Kraj"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Lokalizacja"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organizacja"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Departament"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Opis"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Akcje"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Edytuj"
-
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -508,10 +333,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Obiekt"
 
@@ -552,8 +377,8 @@ msgstr "Przyczyna utworzenia tego snapshot'u"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Kontynuuj"
 
@@ -562,17 +387,17 @@ msgstr "Kontynuuj"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -583,18 +408,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -602,11 +433,17 @@ msgstr "Kontynuuj"
 msgid "Error"
 msgstr "Błąd"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Informacja"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -750,21 +587,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Filtry"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -795,7 +617,7 @@ msgstr "Menu główne GOsa"
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr "Błąd krytyczny"
 
@@ -820,8 +642,8 @@ msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
@@ -830,7 +652,7 @@ msgstr "Błąd konfiguracji"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "Password method"
 msgstr "Przechowywanie hasła"
@@ -857,10 +679,10 @@ msgstr "Hasło podane jako nowe jest za krótkie."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -917,31 +739,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1092,9 +914,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1108,14 +930,14 @@ msgstr "Uprawnienie"
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
@@ -1164,148 +986,158 @@ msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
 "skonfigurowana w gosa.conf."
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "Resetuj ACL'e"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Jeden poziom"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Obecny obiekt"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Pełne poddrzewo"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Pełne poddrzewo (trwałe)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Użyj ACL zdefiniowanego w tej roli"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Góra"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "W dół"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Edytuj"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Brak ustawień ACL w tej kategorii"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Zawiera ACL'e w tych kategoriach: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "Kategoria ACL"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, fuzzy, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Wszystkie obiekty w obecnym poddrzewie"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Zaawansowane ustawienia telefonu"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Utwórz obiekty"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Przenieś obiekty"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Usuń obiekty"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "czytanie"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "zapisywanie"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 #, fuzzy
 msgid "Complete object"
 msgstr "Utwórz obiekty"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1317,161 +1149,148 @@ msgstr "Utwórz obiekty"
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Pełniona funkcja"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 #, fuzzy
 msgid "unknown role"
 msgstr "! nieznane id"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "inactive"
 msgstr "Aktywne"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Członkowie grupy"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 #, fuzzy
 msgid "Access control list"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACLe"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Zamknij"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+#, fuzzy
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Wybierz wszystko"
+
+#: include/class_listing.inc:519
+msgid "created by"
+msgstr "utworzone przez"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:988
 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:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Wyślij"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
-
-#: include/class_baseSelectDialog.inc:28
-#, fuzzy
-msgid "Choose a base"
-msgstr "Wybierz bazę"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Wybierz wszystko"
-
-#: include/class_listing.inc:521
-msgid "created by"
-msgstr "utworzone przez"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Akcje"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 #, fuzzy
 msgid "Export list"
 msgstr "Export"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
@@ -1552,7 +1371,7 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
 "przekroczony"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Konfiguruj"
 
@@ -1795,6 +1614,42 @@ msgstr "Usuń snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Opis"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -1899,42 +1754,42 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "od"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "do"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr "Odtwórz"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "wytnij"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "kopiuj"
 
@@ -1978,332 +1833,332 @@ msgstr "Kontynuuj"
 msgid "XML error"
 msgstr "błąd LDAP:"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, fuzzy, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Wybierz obiekty do dodania"
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, fuzzy, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Zaznacz aby zobaczyć grupy zawierające użytkowników"
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, fuzzy, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Wybierz obiekty do dodania"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Zaznacz aby wyszukiwać wewnątrz poddrzew"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 #, fuzzy
 msgid "You have no permission to delete this object!"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 #, fuzzy
 msgid "You have no permission to delete the object:"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 #, fuzzy
 msgid "You have no permission to delete these objects:"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 #, fuzzy
 msgid "You have no permission to create this object!"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 #, fuzzy
 msgid "You have no permission to create the object:"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 #, fuzzy
 msgid "You have no permission to create these objects:"
 msgstr "Brak uprawnień do usunięcia tego departamentu."
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 #, fuzzy
 msgid "You have no permission to modify this object!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 #, fuzzy
 msgid "You have no permission to modify the object:"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 #, fuzzy
 msgid "You have no permission to modify these objects:"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 #, fuzzy
 msgid "You have no permission to view this object!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 #, fuzzy
 msgid "You have no permission to view the object:"
 msgstr "Brak uprawnień do tworzenia telefonu w tym elemencie."
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 #, fuzzy
 msgid "You have no permission to view these objects:"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 #, fuzzy
 msgid "You have no permission to move this object!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 #, fuzzy
 msgid "You have no permission to move the object:"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 #, fuzzy
 msgid "You have no permission to move these objects:"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 #, fuzzy
 msgid "Connection information"
 msgstr "Informacje osobiste"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, fuzzy, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Nie można połączyć się z serwerem baz danych!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, fuzzy, php-format
 msgid "Cannot select %s database!"
 msgstr "Nie można wybrać bazy danych!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, fuzzy, php-format
 msgid "Cannot query %s database!"
 msgstr "Nie można wybrać bazy danych!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, fuzzy, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Pole 'Fax' zawiera nieprawidłowy numer telefonu."
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, fuzzy, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "Polecenie '%s' podane jako CHECK dla dodatku '%s' nie istnieje."
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, fuzzy, php-format
 msgid "'%s' command is invalid!"
 msgstr "Podana nazwa jest nieprawidłowa"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, fuzzy, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "Podana nazwa jest nieprawidłowa"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Nie można wybrać bazy danych!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Nie można wybrać bazy danych!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, fuzzy, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Wartość podana jako 'UID' jest za mała."
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "Wartość podana jako 'shadowMin' powinna być mniejsza niż 'shadowMax'."
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, fuzzy, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Wartość podana jako 'UID' jest za mała."
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, fuzzy, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 "PHP musi być w wersji 4.1.0 lub wyższej z powodu używanych funkcji i błędów "
 "w języku PHP."
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, fuzzy, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Już istnieje osoba z takim samym loginem w bazie."
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, fuzzy, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Przykład"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Rozszerzenie inwentarza"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr "Ustaw %s"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr "Edytuj %s..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Wróć"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "To konto nie posiada poprawnych rozszerzeń GOsa."
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 "To konto posiada rozszerzenia posix. Można je wyłączyć klikająć poniżej."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2312,14 +2167,14 @@ msgstr ""
 "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
 "konto Samba/Środowisko."
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 "To konto nie posiada rozszerzenia posix. Można je włączyć klikająć poniżej."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2328,228 +2183,233 @@ msgstr ""
 "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
 "konto Samba/Środowisko."
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "Ustawienia Aplikacji"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Ustawienia Posix"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Styczeń"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Luty"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Marzec"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Maj"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Lipiec"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Sierpień"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Październik"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Listopad"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Grudzień"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Wednesday"
 msgstr "Środa"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Piątek"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr "Zapytanie MySQL nieudane!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "read operation"
 msgstr "Opcje poczty"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "modify operation"
 msgstr "Informacje osobiste"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "delete operation"
 msgstr "Wybierz aby zobaczyc stacje robocze"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "search operation"
 msgstr "Konto wygasa po"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "authentication"
 msgstr "Autentykacja Nagios"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "Zapytanie do bazy danych nieudane"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "Zapytanie do bazy danych nieudane"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 #, fuzzy
 msgid "Upload failed!"
 msgstr "Logowanie użytkownika nieudane, odpowiedź serwera LDAP '%s'."
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Użytkownik bazy logowania"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr "Błąd komunikacji z usługą infrastruktury!"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Błąd komunikacji z usługą infrastruktury: %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Utwórz nowy departament"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Sprawdzam wsparcie dla iconv"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Ostrzeżenie wydajności"
@@ -2713,12 +2573,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Ogólne"
@@ -2769,18 +2629,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Grupa"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departament"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2886,19 +2759,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2928,25 +2801,73 @@ msgstr "Użytkownik"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Kontener"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtry"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -2996,7 +2917,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:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Grupy obiektów"
 
@@ -3021,106 +2942,106 @@ msgstr "Szablony"
 msgid "Windows Install"
 msgstr "Stacja robocza Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "za dużo różnych obiektów!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "użytkownicy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "grupy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "aplikacje"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "departamenty"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "serwery"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "stacje robocze"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr "Stacje Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "terminale"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "telefony"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "drukarki"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "wyłączone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "pełen dostęp"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "Nieistniejące dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 #, 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr "Podstawowa grupa obiektu"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Zaufanie systemowe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr "Członek"
 
@@ -3139,36 +3060,19 @@ msgstr "Nazwa grupy"
 msgid "Descriptive text for this group"
 msgstr "Tekst opisowy dla tej grupy"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Wybierz poddrzewo do umieszczenia grupy"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Wybierz bazę"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Dodaj członka"
 
@@ -3317,6 +3221,12 @@ msgstr "serwery"
 msgid "Select objects to add"
 msgstr "Wybierz obiekty do dodania"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtry"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Wyświetl obiekty departamentu"
@@ -3372,16 +3282,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Imię"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Nazwisko"
 
@@ -3396,46 +3306,46 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr "Posixowa nazwa grupy"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr "Zwyczajowo ID są generowane automatycznie, wybierz aby podać ręcznie"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Wymuś GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Wymuś numer ID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Wybierz aby utworzyć grupę samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "w domenie"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Członkowie są w grupie odbioru telefonu"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Członkowie są w grupie nagios."
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Członkowie grupy"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "We wszystkich grupach"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "Nie we wszystkich grupach"
 
@@ -3455,71 +3365,89 @@ msgstr "Pokaż grupy samba"
 msgid "Show mail groups"
 msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Ustawienia grupy"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista grup"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "Grupa podstawowa"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "serwery"
+
+#: plugins/admin/groups/class_group.inc:162
 #, 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:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Grupa Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Administratorzy domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Użytkownicy domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Goście domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Specjalna grupa (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! nieznane id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3527,49 +3455,31 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr "Ogólne ustawienia grupy"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr "Typ grupy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Katalog domowy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr "Grupie odbioru telefonu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr "Grupa nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr "Członek grupy"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Ustawienia grupy"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista grup"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "Grupa podstawowa"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "serwery"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Administracja Grupą"
@@ -3848,6 +3758,52 @@ msgstr ""
 "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
 "drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista departamentów"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "w domenie"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administratorzy domeny"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Kraj"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "Lokalizacja"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organizacja"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -3868,36 +3824,27 @@ msgstr "Nazwa tworzonego poddrzewa"
 msgid "Descriptive text for department"
 msgstr "Tekst opisujący departament"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Wybierz poddrzewo do umieszczenia departamentu"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Ustawienia administracyjne"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
 
@@ -3916,7 +3863,7 @@ msgstr "Tekst opisujący departament"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Kategoria"
@@ -3926,75 +3873,75 @@ msgstr "Kategoria"
 msgid "Category for this subtree"
 msgstr "Kategoria dla tego poddrzewa"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Stan"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Stan w którym jest umieszczone to poddrzewo"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Lokalizacja tego poddrzewa"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Kod pocztowy tego poddrzewa"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Bazowy numer telefonu tego poddrzewa"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Bazowy numer faxu tego poddrzewa"
 
@@ -4008,8 +3955,8 @@ msgid "Domain Component"
 msgstr "Administratorzy domeny"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Departamenty"
 
@@ -4029,7 +3976,7 @@ msgid "Organization name"
 msgstr "Nazwa organizacji"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
@@ -4057,47 +4004,47 @@ msgstr "Nazwa tworzonego poddrzewa"
 msgid "Name of country to create"
 msgstr "Nazwa tworzonego poddrzewa"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
 "administracyjnej!"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Zaznaczanie '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Przenoszenie '%s' do '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "BŁĄD kopiowania %s, anulowanie operacji"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Nazwa departamentu"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Obiekt '%s' jest już zaznaczony"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Usuwanie znacznika z obiektu '%s'"
@@ -4161,7 +4108,7 @@ msgid "ACL Templates"
 msgstr "Szablony ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 #, fuzzy
 msgid "Access control roles"
 msgstr "Kontrola dostępu"
@@ -4171,53 +4118,53 @@ msgstr "Kontrola dostępu"
 msgid "Edit AC roles"
 msgstr "ACLe"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "Resetuj ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "Brak ustawień ACL w tej kategorii"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Zawiera ACL'e w tych kategoriach: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Edytuj kategorie ACL'i"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Kategoria"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy
 msgid "Object in use"
 msgstr "Nazwa obiektu"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Pełniona funkcja"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr "Uprawnienia"
 
@@ -4250,261 +4197,261 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Ustawienia Aplikacji"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "kobieta"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "mężczyzna"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr "Nie można wgrać pliku!"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Numer seryjny"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certyfikat jest ważny od %s do %s i jest obecnie %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "prawidłowy"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "nieprawidłowy"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Brak zainstalowanych certyfikatów"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr "Nie można otworzyć certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Nmer seryjny certyfikatu"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Moje konto "
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
@@ -4537,66 +4484,69 @@ msgstr "Nazwa Szablonu"
 msgid "Preferred langage"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Wybierz poddrzewo do umieszczenia konta."
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Edytuj certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr "Ogranicz logowanie do"
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr "IP lub sieć"
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Proszę użyć zakładki telefony"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Wybierz poddrzewo do umieszczenia konta."
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Wybierz bazę"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Ustawienia użytkownika"
@@ -5208,6 +5158,10 @@ msgstr "Administracja użytkownikami"
 msgid "Migrate"
 msgstr "Utwórz"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Zamknij"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6711,6 +6665,16 @@ msgstr "Tek krok umożliwia wybranie preferowanego języka."
 msgid "Automatic"
 msgstr "Automatycznie"
 
+#, fuzzy
+#~ msgid "Choose a base"
+#~ msgstr "Wybierz bazę"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia departamentu"
+
 #~ msgid "Update"
 #~ msgstr "Aktualizuj"
 

diff --git a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
index bdf6564c1b2c9219ab2aecc973af2c503579df79..71c17a4ac1eeee700673e80a16c471d45bfe6483 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2009-03-02 15:03-0300\n"
 "Last-Translator: Clever de Oliveira Jr. <clever@dri.cefetmg.br>\n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -16,57 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Base"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Filtros"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -75,8 +24,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -113,7 +62,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -185,7 +134,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Salvar"
@@ -225,7 +174,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Definir"
@@ -234,22 +183,22 @@ msgstr "Definir"
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -275,7 +224,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Membros"
 
@@ -283,7 +232,7 @@ msgstr "Membros"
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr ""
 
@@ -330,129 +279,6 @@ msgstr "Alterar senha"
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista dos departamentos"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "no domínio"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Administradores do domínio"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "País"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr ""
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organização"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Departamento"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Descrição"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Ações"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editar"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -487,10 +313,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Objeto"
 
@@ -529,8 +355,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Continuar"
 
@@ -539,17 +365,17 @@ msgstr "Continuar"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -560,18 +386,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -579,11 +411,17 @@ msgstr "Continuar"
 msgid "Error"
 msgstr "Erro"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Informação"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -716,21 +554,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Filtros"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -763,7 +586,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr ""
 
@@ -788,8 +611,8 @@ msgstr "A configuração GOsa %s/%s não pôde ser lida. Abortado."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -798,7 +621,7 @@ msgstr "Erro de configuração"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr ""
 
@@ -825,10 +648,10 @@ msgstr "A senha utilizada como nova é curta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -885,31 +708,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1052,9 +875,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1067,14 +890,14 @@ msgstr ""
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -1119,143 +942,153 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Controle de acesso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gerenciar listas de controle de acesso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Todas as categorias"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "Limpar ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Um nível"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Objeto atual"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Subárvore completa"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Subárvore completa (permanente)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Use ACL definida na regra"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuários"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Para cima"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Para baixo"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Editar"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr "Nenhuma configuração de ACL para essa categoria!"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contém ACLs para estes objetos: %s"
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "Categoria ACL"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s' - o escopo é '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Todos os objetos na subárvore atual"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr "Exibir/Ocultar configurações avançadas"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Criar objetos"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Remover objetos"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 msgid "Grant permission to owner"
 msgstr "Conceder permissão para o dono"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "leitura"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "escrita"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr "Objeto completo"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1267,154 +1100,142 @@ msgstr "Objeto completo"
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Tipo de ACL desconhecida '%s'!"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrada desconhecida '%s'!"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr "Regra: %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr "regra desconhecida"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contém configurações para estes objetos: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Membros do grupo"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr "Lista de controle de acesso"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr "Regras de ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Fechar"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr ""
+
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "Criar"
+
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Submeter"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr ""
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr ""
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "Criar"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Ações"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -1486,7 +1307,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Configurar"
 
@@ -1719,6 +1540,42 @@ msgstr ""
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descrição"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1820,41 +1677,41 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr ""
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr ""
 
@@ -1901,546 +1758,551 @@ msgstr "Continuar"
 msgid "XML error"
 msgstr "Erro de LDAP"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Selecione para listar objetos do tipo '%s'."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Selecione para listar objetos contendo '%s'."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Selecione para listar objetos que possuem '%s' habilitado"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Selecione para pesquisar dentro das sub-árvores"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "Esse objeto será apagado!"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "Esse objeto '%s' será apagado!"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Esse objeto será apagado: %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "Esse objeto '%s' será apagado: %s"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Esse objeto será apagado:"
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "Esse objeto '%s' será apagado:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Estes objetos serão apagados: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Estes objetos '%s' serão apagados: %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "Você não tem permissão para apagar esse objeto!"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "Você não tem permissão para apagar o objeto:"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "Você não tem permissão para apagar estes objetos:"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "Você não tem permissão para criar esse objeto!"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "Você não tem permissão para criar o objeto:"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "Você não tem permissão para criar estes objetos:"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "Você não tem permissão para modificar esse objeto!"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "Você não tem permissão para modificar o objeto:"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "Você não tem permissão para modificar estes objetos:"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "Você não tem permissão para ver esse objeto!"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "Você não tem permissão para ver o objeto:"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "Você não tem permissão para ver estes objetos:"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "Você não tem permissão para mover esse objeto!"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "Você não tem permissão para mover o objeto:"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "Você não tem permissão para mover estes objetos:"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Informação da conexão"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Não foi possível conectar ao banco de dados  %s!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "Não foi possível selecionar o banco de dados %s!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "Servidor %s não definido!"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "Não foi possível pesquisar no banco de dados %s!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "O campo '%s' contém uma palavra reservada!"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "O comando especificado como %s, relativo ao plugin '%s', não existe!"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "O comando '%s' é inválido!"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "O comando '%s' (%s) para o plugin %s é inválido!"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "O comando '%s' para o plugin %s is invalid!"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "O comando '%s' (%s) é inválido!"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Não foi possível executar o comando '%s'!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "Não foi possível executar o comando '%s' (%s) para o plugin %s!"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Não foi possível executar o comando '%s' para o plugin %s!"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Voltar"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
 "the %s settings first!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Clique em Editar para alterar as informações desta janela"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Janeiro"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Fevereiro"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Março"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Abril"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Maio"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Junho"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Julho"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Agosto"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Setembro"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Outubro"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Novembro"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Dezembro"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Segunda"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr "Terça"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr "Quinta"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Sexta"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 msgid "MySQL operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Alerta de performance"
@@ -2610,12 +2472,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Geral"
@@ -2666,18 +2528,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr ""
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departamento"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2782,19 +2657,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2824,25 +2699,73 @@ msgstr "Usuário"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtros"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -2892,7 +2815,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Grupos de objeto"
 
@@ -2914,104 +2837,104 @@ msgstr "Modelos"
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "Usuários"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "Grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "Aplicações"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "Departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "Servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "Estações de Trabalho"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "Terminais"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "Telefones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "Impressoras"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "desabilitado"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "acesso completo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "Dn não existente:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr ""
 
@@ -3030,36 +2953,19 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Selecione a base"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr ""
 
@@ -3198,6 +3104,12 @@ msgstr "Remover foto"
 msgid "Select objects to add"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Filtros"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr ""
@@ -3254,16 +3166,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Nome fornecido"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "Sobrenome"
 
@@ -3278,46 +3190,46 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forçar GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "no domínio"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Membros estão no grupo phone pickup"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Membros do grupo"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr ""
 
@@ -3339,69 +3251,87 @@ msgstr "Usuários do domínio"
 msgid "Show mail groups"
 msgstr "Usuários do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dos grupos"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "Lista dos grupos"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "Remover foto"
+
+#: plugins/admin/groups/class_group.inc:162
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Grupo samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Administradores do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Usuários do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Convidados do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! id desconhecido"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3409,48 +3339,30 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr ""
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista dos grupos"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "Lista dos grupos"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "Remover foto"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Administração de grupos"
@@ -3726,6 +3638,51 @@ msgstr ""
 "sua árvore LDAP em um arquivo. Então, se pronto, pressione 'Deletar' para "
 "continuar ou 'Cancelar' para abortar."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dos departamentos"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "no domínio"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administradores do domínio"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "País"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organização"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -3744,36 +3701,27 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr ""
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -3792,7 +3740,7 @@ msgstr "Exibir sistemas do departamento"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -3802,75 +3750,75 @@ msgstr ""
 msgid "Category for this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Estado"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Endereço"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
@@ -3883,8 +3831,8 @@ msgid "Domain Component"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -3904,7 +3852,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Caixa postal"
 
@@ -3930,44 +3878,44 @@ msgstr ""
 msgid "Name of country to create"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Nome do departamento"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4024,7 +3972,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr ""
 
@@ -4032,50 +3980,50 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Papel"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr ""
 
@@ -4107,27 +4055,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "feminino"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "masculino"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Número serial"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4135,232 +4083,232 @@ msgstr ""
 "(Alguns tipos de certificados não são suportados atualmente e podem ser "
 "exibidos como 'inválidos'.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certificado é válido de %s para %s e está atualmente %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "inválido"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Nenhum certificado instalado"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidade"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificação da residência"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Vocação"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última entrega"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Localização da pessoa"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrição da unidade"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de assunto"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Título funcional"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número serial do certificado"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visível publicamente"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rua"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CEP"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Minha conta"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título pessoal"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Título acadêmico"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto do usuário"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr ""
 
@@ -4393,66 +4341,69 @@ msgstr "Nome modelo"
 msgid "Preferred langage"
 msgstr "Linguagem preferida"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Escolha a sub-árvore para adicionar o usuário"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Telefone privativo"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Armazenamento da senha"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Por favor, utilize a orelha telefone"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Escolha a sub-árvore para adicionar o usuário"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Selecione a base"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Configurações do usuário"
@@ -5031,6 +4982,10 @@ msgstr ""
 msgid "Migrate"
 msgstr ""
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Fechar"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""

diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
index d270610ff9d8761a954661f099305e322d3cf12d..6081ec2f55d48ce6c81d185de5e5d59ea604effb 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -14,57 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Ветка"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Фильтры"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -73,8 +22,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -115,7 +64,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -191,7 +140,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Сохранить"
@@ -241,7 +190,7 @@ msgstr ""
 "Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
 "позволить использовать фильтры"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Установить"
@@ -250,25 +199,25 @@ msgstr "Установить"
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 #, fuzzy
 msgid "New ACL"
 msgstr "Создать"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "ACL type"
 msgstr "Тип"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Выберите, чтобы просмотреть серверы"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -296,7 +245,7 @@ msgstr "Доступные приложения"
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 #, fuzzy
 msgid "Members"
 msgstr "Включаемые объекты"
@@ -305,7 +254,7 @@ msgstr "Включаемые объекты"
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Выберите тип мыши"
@@ -359,130 +308,6 @@ msgstr "Сменить пароль"
 msgid "Click here to change your password"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Список подразделений"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "в домене"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Администраторы домена"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Страна"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Местоположение"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Организация"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Подразделение"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Описание"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Действия"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Изменить"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -518,10 +343,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "Объект"
 
@@ -562,8 +387,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Продолжить"
 
@@ -572,17 +397,17 @@ msgstr "Продолжить"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -593,18 +418,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -612,11 +443,17 @@ msgstr "Продолжить"
 msgid "Error"
 msgstr ""
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Информация"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -765,21 +602,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Фильтры"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -811,7 +633,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Fatal error"
 msgstr "Терминал-сервер"
@@ -838,8 +660,8 @@ msgstr ""
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -849,7 +671,7 @@ msgstr "Настроить"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "Password method"
 msgstr "Хэширование паролей"
@@ -876,10 +698,10 @@ msgstr "Новый пароль слишком короткий."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -938,31 +760,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1117,9 +939,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 #, fuzzy
@@ -1134,14 +956,14 @@ msgstr "Права для членов группы"
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
@@ -1186,158 +1008,168 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 #, fuzzy
 msgid "Access control"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 #, fuzzy
 msgid "All categories"
 msgstr "Категория"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "One level"
 msgstr "Уровень информативности"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 #, fuzzy
 msgid "Current object"
 msgstr "Текущий пароль"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 #, fuzzy
 msgid "Complete subtree"
 msgstr "не полный"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Пользователи"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Изменить"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "Доступ"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 #, fuzzy
 msgid "category ACL"
 msgstr "Категория"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Настройки телефона"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 #, fuzzy
 msgid "Create objects"
 msgstr "Объект группы"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 #, fuzzy
 msgid "Move objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 #, fuzzy
 msgid "Remove objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Удалить"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "чтение"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "запись"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 #, fuzzy
 msgid "Complete object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1350,176 +1182,162 @@ msgstr "Включаемые объекты"
 msgid "Internal error"
 msgstr "Терминал-сервер"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Роль"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 #, fuzzy
 msgid "unknown role"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "inactive"
 msgstr "Личный"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Члены группы"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 #, fuzzy
 msgid "Access control list"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 #, fuzzy
 msgid "ACL roles"
 msgstr "Доступ"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
 #, fuzzy
-msgid "Close"
-msgstr "Выбрать"
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+#, fuzzy
+msgid "Select all"
+msgstr "Удалить"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "Создать"
+
+#: include/class_listing.inc:988
 #, fuzzy
 msgid "Go to root department"
 msgstr "Список подразделений"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 #, fuzzy
 msgid "Root"
 msgstr "Перезагрузить"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 #, fuzzy
 msgid "Go up one department"
 msgstr "Подразделение"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 #, fuzzy
 msgid "Go to users department"
 msgstr "Выберите подразделение"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 #, fuzzy
 msgid "Home"
 msgstr "Имя системы"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
-
-#: include/class_baseSelectDialog.inc:28
-#, fuzzy
-msgid "Choose a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-#, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "Создать"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Действия"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 #, fuzzy
 msgid "Copy"
 msgstr "Компания"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 #, fuzzy
 msgid "Cut"
 msgstr "Выполнить"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 #, fuzzy
 msgid "Export list"
 msgstr "Экспорт"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Объект группы"
@@ -1605,7 +1423,7 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Настроить"
 
@@ -1851,6 +1669,42 @@ msgstr "Создать настройки запись эл. почты"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Описание"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1967,46 +1821,46 @@ msgstr "Тип"
 msgid "Arguments"
 msgstr "подразделения"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 #, fuzzy
 msgid "from"
 msgstr "и"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 #, fuzzy
 msgid "Restore"
 msgstr "Повторить"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr ""
 
@@ -2051,329 +1905,329 @@ msgstr "Продолжить"
 msgid "XML error"
 msgstr "Ошибка LDAP:"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, fuzzy, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Выбрать объекты для добавления"
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, fuzzy, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Показать группы с пользователями"
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, fuzzy, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Выбрать объекты для добавления"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #, fuzzy
 msgid "Select to search within subtrees"
 msgstr "Искать в поддеревьях"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 #, fuzzy
 msgid "You have no permission to delete this object!"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 #, fuzzy
 msgid "You have no permission to delete the object:"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 #, fuzzy
 msgid "You have no permission to delete these objects:"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 #, fuzzy
 msgid "You have no permission to create this object!"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 #, fuzzy
 msgid "You have no permission to create the object:"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 #, fuzzy
 msgid "You have no permission to create these objects:"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 #, fuzzy
 msgid "You have no permission to modify this object!"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 #, fuzzy
 msgid "You have no permission to modify the object:"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 #, fuzzy
 msgid "You have no permission to modify these objects:"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 #, fuzzy
 msgid "You have no permission to view this object!"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 #, fuzzy
 msgid "You have no permission to view the object:"
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 #, fuzzy
 msgid "You have no permission to view these objects:"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 #, fuzzy
 msgid "You have no permission to move this object!"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 #, fuzzy
 msgid "You have no permission to move the object:"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 #, fuzzy
 msgid "You have no permission to move these objects:"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 #, fuzzy
 msgid "Connection information"
 msgstr "Личная информация"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, fuzzy, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, fuzzy, php-format
 msgid "Cannot select %s database!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, fuzzy, php-format
 msgid "Cannot query %s database!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, fuzzy, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, fuzzy, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, fuzzy, php-format
 msgid "'%s' command is invalid!"
 msgstr "Указанное имя уже используется."
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, fuzzy, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "Указанное имя уже используется."
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, fuzzy, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Значение 'UID' слишком маленькое."
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 "Значение поля \"shadowMin\" должно быть меньше значения поля \"shadowMax\"."
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, fuzzy, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Значение 'UID' слишком маленькое."
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, fuzzy, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 "У вас должна быть установка PHP версии не ниже 4.1.0, так как в ней "
 "реализованы некоторые новые функции и исправлены некоторые ошибки."
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, fuzzy, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 "Пользователь с таким регистрационным именем в базе данных уже существует."
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, fuzzy, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "Сменить пароль"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Удалить параметры"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Добавить"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, fuzzy, php-format
 msgid "Add %s"
 msgstr "Добавить"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, fuzzy, php-format
 msgid "Delete %s"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, fuzzy, php-format
 msgid "Set %s"
 msgstr "Установить"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit..."
 msgstr "Изменить"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit %s..."
 msgstr "Пользователи домена"
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Назад"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Для этой учетной записи нет корректных расширений GOsa."
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2381,7 +2235,7 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Вы можете отключить их "
 "использование, щелкнув ниже."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2390,7 +2244,7 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
 "использование, сначала нужно удалить учетную запись Samba."
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2398,7 +2252,7 @@ msgstr ""
 "В этой учетной записи не используются атрибуты POSIX. Вы можете использовать "
 "их, щелкнув ниже."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2407,230 +2261,235 @@ msgstr ""
 "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
 "использование, сначала нужно удалить учетную запись Samba."
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "Дополнительные записи в fstab"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Атрибуты UNIX"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Январь"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Февраль"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Март"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Апрель"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Май"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Июнь"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Июль"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Август"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Сентябрь"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Октябрь"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Ноябрь"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Декабрь"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Sunday"
 msgstr "Имя сервера"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Monday"
 msgstr "месяц"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "read operation"
 msgstr "Почтовые настройки"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "modify operation"
 msgstr "Личная информация"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "delete operation"
 msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "search operation"
 msgstr "Учетная запись"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "authentication"
 msgstr "Рабочая станция Windows"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 #, fuzzy
 msgid "Upload failed!"
 msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Служба печати"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "Описание группы"
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Описание группы"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Список подразделений"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Проверка поддержки gettext"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
@@ -2797,12 +2656,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Общее"
@@ -2853,18 +2712,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Группа"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2974,19 +2846,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -3016,25 +2888,73 @@ msgstr "Пользователь"
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Ветка"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтры"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -3086,7 +3006,7 @@ msgstr ""
 "сможет восстановить эти данные."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Объединения"
 
@@ -3112,110 +3032,110 @@ msgstr "Шаблон"
 msgid "Windows Install"
 msgstr "Рабочая станция Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "слишком много различных объектов!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "пользователи"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "приложения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "подразделения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "серверы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "рабочие станции"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 #, fuzzy
 msgid "winstations"
 msgstr "Рабочая станция"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "терминалы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "телефоны"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "отключен"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/admin/ogroups/class_ogroup.inc:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 #, fuzzy
 msgid "Non existing dn:"
 msgstr "Не существующий dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 #, fuzzy
 msgid "Object group generic"
 msgstr "Объект группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Системные доверия"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 #, fuzzy
 msgid "Member"
 msgstr "Включаемые объекты"
@@ -3235,38 +3155,20 @@ msgstr "Название группы"
 msgid "Descriptive text for this group"
 msgstr "Описание группы"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Выберите ветку для группы"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-#, fuzzy
-msgid "Select a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Системные доверия"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 #, fuzzy
 msgid "Trust mode"
 msgstr "Режим"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
@@ -3419,6 +3321,12 @@ msgstr "серверы"
 msgid "Select objects to add"
 msgstr "Выбрать объекты для добавления"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Фильтры"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Показать объекты подразделения"
@@ -3475,16 +3383,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Имя"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 #, fuzzy
 msgid "Surname"
 msgstr "Имя сервера"
@@ -3500,50 +3408,50 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr "Имя группы, соответствующее стандарту POSIX"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Обычно идентификаторы создаются автоматически, но вы можете выбрать указание "
 "вручную"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Указать GID вручную"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Указанный вручную GID"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Создать группу для работы с Samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "в домене"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 #, fuzzy
 msgid "Members are in a nagios group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Члены группы"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 #, fuzzy
 msgid "In all groups"
 msgstr "Основная группа"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 #, fuzzy
 msgid "Not in all groups"
 msgstr "Показать группы с эл. почтой"
@@ -3564,70 +3472,89 @@ msgstr "Показать группы samba"
 msgid "Show mail groups"
 msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Список групп"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "Основная группа"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "серверы"
+
+#: plugins/admin/groups/class_group.inc:162
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "состояние неизвестно"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3635,55 +3562,36 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 #, fuzzy
 msgid "Samba group type"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Домашний каталог Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 #, fuzzy
 msgid "Nagios group"
 msgstr "Контакт"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 #, fuzzy
 msgid "Group member"
 msgstr "Члены группы"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Настройки Samba"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Список групп"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "Основная группа"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "серверы"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Управление группами"
@@ -3985,6 +3893,52 @@ msgstr ""
 "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
 "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Список подразделений"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "в домене"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Администраторы домена"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Страна"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "Местоположение"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Организация"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -4005,37 +3959,28 @@ msgstr "Имя создаваемой ветки"
 msgid "Descriptive text for department"
 msgstr "Описание подразделения"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Выберите ветку для подразделения"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 #, fuzzy
 msgid "Administrative settings"
 msgstr "Администрирование"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -4054,7 +3999,7 @@ msgstr "Описание подразделения"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Категория"
@@ -4064,75 +4009,75 @@ msgstr "Категория"
 msgid "Category for this subtree"
 msgstr "Категория этой ветки"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Адм. единица"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Адм. единица, в которой находится ветка"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Местоположение ветки"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Адрес"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Почтовый адрес для ветки"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Основный телефонный номер для ветки"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Факс"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Основный номер факса для ветки"
 
@@ -4146,8 +4091,8 @@ msgid "Domain Component"
 msgstr "Администраторы домена"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Подразделения"
 
@@ -4169,7 +4114,7 @@ msgid "Organization name"
 msgstr "Организация"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
@@ -4200,45 +4145,45 @@ msgstr "Имя создаваемой ветки"
 msgid "Name of country to create"
 msgstr "Имя создаваемой ветки"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 #, fuzzy
 msgid "Department name"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Телефон"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4301,7 +4246,7 @@ msgid "ACL Templates"
 msgstr "Шаблон"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 #, fuzzy
 msgid "Access control roles"
 msgstr "Параметры доступа"
@@ -4311,55 +4256,55 @@ msgstr "Параметры доступа"
 msgid "Edit AC roles"
 msgstr "Доступ"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Удалить"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Описание группы"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Описание группы"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Список систем"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Категория"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy
 msgid "Object in use"
 msgstr "Имя объекта"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Роль"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
@@ -4394,276 +4339,276 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "женский"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 #, fuzzy
 msgid "Serial number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "User certificates"
 msgstr "Стандартный сертификат"
@@ -4699,66 +4644,70 @@ msgstr "Шаблон"
 msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Выберите ветку для пользователя"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Выберите ветку для пользователя"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+#, fuzzy
+msgid "Select a base"
+msgstr "Выберите, чтобы просмотреть серверы"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 #, fuzzy
 msgid "User settings"
@@ -5408,6 +5357,11 @@ msgstr "Управление пользователями"
 msgid "Migrate"
 msgstr "Дата"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+#, fuzzy
+msgid "Close"
+msgstr "Выбрать"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6906,6 +6860,16 @@ msgstr "Язык по умолчанию"
 msgid "Automatic"
 msgstr "автоматически"
 
+#, fuzzy
+#~ msgid "Choose a base"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Выберите ветку для группы"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "Выберите ветку для подразделения"
+
 #, fuzzy
 #~ msgid "Show %s"
 #~ msgstr "Показать группы"

diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
index b2e4effd7a58434dd18ae27bda9e796df34d9434..fb5c2d249354781937fb9ca5de79560899f5bd27 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2008-07-04 09:59+0200\n"
 "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
 "Language-Team: Vietnamese\n"
@@ -18,57 +18,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Cơ sở"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "Các bộ lọc"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -77,8 +26,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -118,7 +67,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -198,7 +147,7 @@ msgstr ""
 "có thể lại gặp lỗi khi paste đối tượng này!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "Lưu lại"
@@ -245,7 +194,7 @@ msgstr ""
 "Lờ lỗi này đi và hiển thị tất cả các entry mà phù hợp với giới hạn kích cỡ "
 "đã xác định và thay vào đó cho tôi sử dụng các bộ lọc "
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "Đặt"
@@ -254,22 +203,22 @@ msgstr "Đặt"
 msgid "Assigned ACL for current entry"
 msgstr "Giao ACL cho entry hiện tại"
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 msgid "New ACL"
 msgstr "ACL mới"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 msgid "ACL type"
 msgstr "Dạng ACL"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 msgid "Select an acl type"
 msgstr "Chọn một dạng acl"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -295,7 +244,7 @@ msgstr "Những thành viên đang có mặt"
 msgid "List message possible targets"
 msgstr "Liệt kê các mục tiêu có thể gửi tin nhắn"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "Các thành viên"
 
@@ -303,7 +252,7 @@ msgstr "Các thành viên"
 msgid "List message recipients"
 msgstr "Liệt kê người nhận tin"
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 msgid "List of available ACL categories"
 msgstr "Danh sách tất cả các mục ACL hiện có"
 
@@ -350,130 +299,6 @@ msgstr "Thay đổi mật mã "
 msgid "Click here to change your password"
 msgstr "Kích vào đây để thay đổi mật khẩu của bạn"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Danh sách các bộ phận"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "trong miền"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Admin miền"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Quốc Gia"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Vị trí"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Tổ chức"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Bộ phận"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "Mô tả"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "Các thao tác"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Hiệu chỉnh"
-
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Phiên GOsa của bạn vừa bị đóng!"
@@ -517,10 +342,10 @@ msgstr ""
 "in được chọn có còn tồn tại không?"
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "đối tượng"
 
@@ -565,8 +390,8 @@ msgstr "Lý do để tạo ra snapshot này"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "Tiếp tục"
 
@@ -575,17 +400,17 @@ msgstr "Tiếp tục"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -596,18 +421,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -615,11 +446,17 @@ msgstr "Tiếp tục"
 msgid "Error"
 msgstr "Lỗi"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "Thông tin"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -766,21 +603,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Các bộ lọc"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -813,7 +635,7 @@ msgstr "Menu chính của GOsa"
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Fatal error"
 msgstr "Lỗi nặng"
 
@@ -838,8 +660,8 @@ msgstr "Cấu hình GOsa %s/%s không đọc được. Bãi bỏ."
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
@@ -849,7 +671,7 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 msgid "Password method"
 msgstr "Phương pháp lập mật khẩu"
 
@@ -877,10 +699,10 @@ msgstr "Mật khẩu mới cần được cắt ngắn lại."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -943,31 +765,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1118,9 +940,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 msgid "Permission"
@@ -1133,14 +955,14 @@ msgstr "Cho phép"
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Bạn không được phép tạo ra snapshot cho %s."
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Bạn không được phép phục hồi một snapshot cho %s."
@@ -1190,144 +1012,154 @@ 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_acl.inc:26
+#: include/class_acl.inc:27
 msgid "Access control"
 msgstr "Kiểm soát truy cập"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Quản lý các danh sách kiểm soát truy cập"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr "Tất cả các mục"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr "Xác lập lại ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 msgid "One level"
 msgstr "Một cấp độ"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr "Đối tượng hiện tại"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr "Hoàn thành cây thư mục con"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr "Hoàn thành cây thư mục con (vĩnh viễn)"
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr "Sử dụng ACL được xác định trong vai trò"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Người dùng"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Lên"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Xuống"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "Hiệu chỉnh"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Xóa"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr "Không có thiết lập ACL cho hạng mục này!"
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Có chứa ACLs cho các đối tượng: %s "
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 msgid "category ACL"
 msgstr "Hạng mục ACL"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho '%s' - phạm vi là '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr "Tất cả các đối tượng hiện trong  cây thư mục con hiện tại"
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 msgid "Show/hide advanced settings"
 msgstr "Hiển thị/ Ẩn các thiết lập cao cấp "
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 msgid "Create objects"
 msgstr "Tạo ra đối tượng"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 msgid "Move objects"
 msgstr "Dịch chuyển đối tượng"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 msgid "Remove objects"
 msgstr "Xóa đối tượng"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Không thể thiết lập phép cho '%s'"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "đọc"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "viết"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 msgid "Complete object"
 msgstr "Hoàn thành đối tượng"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1339,158 +1171,146 @@ msgstr "Hoàn thành đối tượng"
 msgid "Internal error"
 msgstr "Lỗi nội bộ"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "dạng ACL '%s' không được biết đến!"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entry '%s' không được biết đến!"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, php-format
 msgid "Role: %s"
 msgstr "Vai trò: %s"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 msgid "unknown role"
 msgstr "Vai trò không được biết đến"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Chứa các thiết lập cho các đối tượng: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 msgid "inactive"
 msgstr "không hoạt động"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "Các thành viên nhóm"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 msgid "Access control list"
 msgstr "Danh sách kiểm soát truy cập"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 msgid "ACL roles"
 msgstr "Các vai trò ACL"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "Đóng"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+#, fuzzy
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+"Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
+"với Admin của bạn."
+
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+msgid "Select all"
+msgstr "Chọn tất"
+
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "Tạo "
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:988
 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:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 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:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "Nộp"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr "Việc mã hóa DN không thống nhất phát hiện: '%s'"
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
-"với Admin của bạn."
-
-#: include/class_baseSelectDialog.inc:28
-msgid "Choose a base"
-msgstr "Chọn một gốc"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
-msgstr "Chọn tất"
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "Tạo "
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "Các thao tác"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
@@ -1575,7 +1395,7 @@ msgstr ""
 "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
 "vượt quá tiêu chuẩn"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "Cấu hình"
 
@@ -1823,6 +1643,42 @@ msgstr "Xóa snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Mô tả"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1927,13 +1783,13 @@ msgstr "Loại"
 msgid "Arguments"
 msgstr "Tranh luận"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1941,29 +1797,29 @@ msgstr ""
 "Đối tượng đã bị thay đổi từ khi được mở trong GOsa. Nếu bạn lưu entry này "
 "lại, khi các đối tượng khác lạc hướng có thể gây ra thêm tất cả các thay đổi!"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr "Thay đổi ACL dn"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "Từ"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "đến"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 msgid "Restore"
 msgstr "Phục hồi"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "cắt"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "Copy"
 
@@ -2010,307 +1866,307 @@ msgstr "Tiếp tục"
 msgid "XML error"
 msgstr "Lỗi MySQL"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "Chọn để liệt kê các đối tượng loại '%s'."
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "Chọn để liệt kê đối tượng chứa '%s'."
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "Chọn để liệt kê đối tượng mà cho phép '%s'"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "Chọn để tìm kiếm trong các cây con"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr "Đối tượng này sẽ bị xóa!"
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr "Đối tượng '%s' này sẽ bị xóa!"
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr "Đối tượng này sẽ bị xóa: %s"
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr "Đối tượng '%s' này sẽ bị xóa: '%s'"
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr "Đối tượng này sẽ bị xóa:"
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr "Đối tượng '%s' này sẽ bị xóa:"
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr "Đối tượng này sẽ bị xóa: %s"
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr "Đối tượng '%s' này sẽ bị xóa; %s"
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 msgid "You have no permission to delete this object!"
 msgstr "Bạn không có quyền xóa đối tượng này!"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 msgid "You have no permission to delete the object:"
 msgstr "Bạn không có quyền xóa đối tượng này:"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 msgid "You have no permission to delete these objects:"
 msgstr "Bạn không có quyền xóa những đối tượng này:"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 msgid "You have no permission to create this object!"
 msgstr "Bạn không có quyền tạo ra đối tượng này!"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 msgid "You have no permission to create the object:"
 msgstr "Bạn không có quyền tạo ra đối tượng này:"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 msgid "You have no permission to create these objects:"
 msgstr "Bạn không có quyền tạo ra những đối tượng này:"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 msgid "You have no permission to modify this object!"
 msgstr "Bạn không có quyền thay đổi đối tượng này!"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 msgid "You have no permission to modify the object:"
 msgstr "Bạn không có quyền thay đổi đối tượng này:"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 msgid "You have no permission to modify these objects:"
 msgstr "Bạn không có quyền thay đổi những đối tượng này:"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 msgid "You have no permission to view this object!"
 msgstr "Bạn không có quyền xem đối tượng này!"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 msgid "You have no permission to view the object:"
 msgstr "Bạn không có quyền xem đối tượng này:"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 msgid "You have no permission to view these objects:"
 msgstr "Bạn không có quyền xem những đối tượng này:"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 msgid "You have no permission to move this object!"
 msgstr "Bạn không có quyền di chuyển đối tượng này!"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 msgid "You have no permission to move the object:"
 msgstr "Bạn không có quyền di chuyển đối tượng này:"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 msgid "You have no permission to move these objects:"
 msgstr "Bạn không có quyền di chuyển những đối tượng này:"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 msgid "Connection information"
 msgstr "Thông tin kết nối"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr "Không thể kết nối đến cơ sở dữ liệu %s!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, php-format
 msgid "Cannot select %s database!"
 msgstr "Không thể lựa chọn cơ sở dữ liệu %s!"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr "Không xác định được  Server '%s'!"
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, php-format
 msgid "Cannot query %s database!"
 msgstr "Không truy vấn được cơ sở dữ liệu %s!"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "Trường '%s' có chứa một từ khóa dự trữ!"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "Lệnh được cụ thể hóa là %s móc nối với plugin '%s' không tồn tại!"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Lệnh '%s' không hợp lệ!"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr "Lệnh '%s' (%s) cho plugin %s không hợp lệ!"
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "Lệnh '%s' cho plugin '%s' không hợp lệ!"
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "Lệnh '%s' (%s) không hợp lệ!"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Không thể chạy lệnh '%s'!"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr "Không thể chạy lệnh '%s' ('%s) cho plugin %s!"
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Không thể chạy lệnh '%s' cho plugin %s!"
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Không thể chạy lệnh '%s' ('%s)!"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Gía trị '%s' quá lớn!"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' phải thấp hơn %d!"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Gía trị '%s' quá nhỏ!"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' phải lớn hơn %d hoặc trên nữa!"
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' phụ thuộc vào '%s'- xin hãy cung cấp cả hai giá trị!"
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Đã có sẵn một entry với thuộc tính '%s' trong hệ thống này!"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Trường được yêu cầu '%s' bị rỗng!"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr "Ví dụ"
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Trường '%s' chứa các ký tự không hợp lệ"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' không được phép:"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' không được cho phép!"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Trường '%s' chứa các ký tự không hợp lệ!"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Thêm vào"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, php-format
 msgid "Add %s"
 msgstr "Thêm %s"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, php-format
 msgid "Delete %s"
 msgstr "Xóa %s"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set %s"
 msgstr "Thiết lập %s"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit..."
 msgstr "Hiệu chỉnh..."
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, php-format
 msgid "Edit %s..."
 msgstr "Hiệu chỉnh %s..."
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "Quay lại"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2318,7 +2174,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc "
 "kích vào bên dưới."
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2327,7 +2183,7 @@ msgstr ""
 "Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa "
 "thiết lập %s trước!"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2335,7 +2191,7 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc "
 "kích vào bên dưới."
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2344,222 +2200,227 @@ msgstr ""
 "Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải "
 "thêm thiết lập %s trước!"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, php-format
 msgid "Add %s settings"
 msgstr "Thêm thiết lập %s "
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, php-format
 msgid "Remove %s settings"
 msgstr "Xóa thiết lập %s"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Kích phím 'Hiệu chỉnh' bên dưới để thay đổi thông tin trong hộp thoại này "
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "Tháng Một"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "Tháng Hai"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "Tháng Ba"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "Tháng Tư"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "Tháng Năm"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "Tháng Tám"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "Tháng Chín"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "Tháng Mười"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "Tháng Mười Hai"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "read operation"
 msgstr "Đọc thao tác"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr "thêm tao tác"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "modify operation"
 msgstr "thay đối thao tác"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "delete operation"
 msgstr "xóa thao tác"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "search operation"
 msgstr "tìm kiếm thao tác"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 msgid "authentication"
 msgstr "Xác định thẩm quyền"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s thất bại!"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 msgid "LDAP operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 msgid "Upload failed!"
 msgstr "Tải lên thất bại!"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Tải lên thất bại: %s"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại!"
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại: %s"
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' này vẫn còn được sử dụng bởi đối tượng: %s "
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' này vẫn còn được sử dụng."
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' vẫn còn được sử dụng bởi các đối tượng này: %s"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "File '%s' không tồn tại!"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Không thể mở file '%s' để đọc!"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Không thể mở file '%s' để viết!"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Không thế xóa file '%s'!"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Không thể xóa folder '%s'!"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kiểm tra hỗ trợ %s"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Cài đặt và kích hoạt mô-đun PHP %s."
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Cảnh báo khả năng hoạt động"
@@ -2726,12 +2587,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Thông tin chung"
@@ -2782,18 +2643,31 @@ msgstr "FTP "
 msgid "Group"
 msgstr "Nhóm "
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Bộ phận"
+
 #: 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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2900,19 +2774,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2942,25 +2816,73 @@ msgstr "Người dùng"
 #: 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/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Cơ sở"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Các bộ lọc"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -3012,7 +2934,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:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "Tất cả các nhóm đối tượng"
 
@@ -3035,107 +2957,107 @@ msgstr "Mẫu"
 msgid "Windows Install"
 msgstr "Cài đặt window"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 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:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "có quá nhiều các đối tượng khác nhau!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "người dùng"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "các nhóm"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "các ứng dụng"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "các bộ phận"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "các server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "máy trạm"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 msgid "winstations"
 msgstr "máy trạm dùng win "
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "các thiết bị cuối"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "điện thoại"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "các máy in"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "Đã vô hiệu"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "Truy cập hoàn toàn"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: 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:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "dn không tồn tại:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 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:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 msgid "Object group generic"
 msgstr "Nhóm đối tượng chung"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 msgid "Member"
 msgstr "Thành viên"
 
@@ -3154,36 +3076,19 @@ msgstr "Tên của nhóm"
 msgid "Descriptive text for this group"
 msgstr "Văn bản mô tả cho nhóm này"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "Chọn một cây thư mục con để đặt nhóm vào"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Chọn một cơ sở"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "Chế độ ủy thác"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "Các đối tượng thành viên"
 
@@ -3321,6 +3226,12 @@ msgstr "các nhóm server"
 msgid "Select objects to add"
 msgstr "Chọn nhóm đối tượng để thêm vào"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "Các bộ lọc"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "Hiển thị nhóm đối tượng của các bộ phận"
@@ -3377,16 +3288,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "Tên thật"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 #, fuzzy
 msgid "Surname"
 msgstr "Họ "
@@ -3402,48 +3313,48 @@ msgstr "Hiệu chỉnh đa dạng"
 msgid "Posix name of the group"
 msgstr "Tên Posix của nhóm"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Thường thì các ID sẽ được tự động sinh ra, hãy lựa chọn để xác định thủ "
 "công  "
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Áp dụng GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Số ID được áp dụng"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "Chọn để tạo ra một nhóm thích hợp với samba"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "trong miền"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "Các thành viên trong một nhóm nhấc điện thoại"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "Các thành viên trong một nhóm Nargios"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "Các thành viên nhóm"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr "Trong tất cả các nhóm"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr "Không ở trong tất cả các nhóm"
 
@@ -3465,70 +3376,88 @@ msgstr "các nhóm samba"
 msgid "Show mail groups"
 msgstr "các nhóm mail"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Thiết lập nhóm"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Danh sách các nhóm"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "các nhóm máy in"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "các nhóm server"
+
+#: plugins/admin/groups/class_group.inc:162
 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:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Nhóm Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "Admin miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "Người dùng miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "Khách miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "Nhóm đặc biệt (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! không nhận ra id này"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, 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:892
+#: plugins/admin/groups/class_group.inc:894
 #, 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:897
+#: plugins/admin/groups/class_group.inc:899
 #, 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:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3536,48 +3465,30 @@ msgstr ""
 msgid "GID"
 msgstr "Số ID của nhóm"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 msgid "Generic group settings"
 msgstr "Thiết lập nhóm chung"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 msgid "Samba group type"
 msgstr "Loại nhóm Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 msgid "Samba domain name"
 msgstr "Tên miền Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 msgid "Phone pickup group"
 msgstr "Nhóm nhấc điện thoại"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 msgid "Nagios group"
 msgstr "Nhóm phần mềm Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 msgid "Group member"
 msgstr "Thành viên nhóm"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Thiết lập nhóm"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Danh sách các nhóm"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "các nhóm máy in"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "các nhóm server"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "Quản trị nhóm"
@@ -3862,6 +3773,52 @@ msgstr ""
 "tại của cây thư mục LDAP trong một file. Nếu bạn đã làm thế, hãy kích "
 "'Delete' để tiếp tục hoặc kích 'Cancel' để hủy bỏ."
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Danh sách các bộ phận"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "trong miền"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Admin miền"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "Quốc Gia"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "Vị trí"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Tổ chức"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -3882,36 +3839,27 @@ msgstr "Tên của cây con được tạo"
 msgid "Descriptive text for department"
 msgstr "Văn bản mô tả cho bộ phận"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "Lựa chọn cây con để đặt bộ phận này vào  "
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "Thiết lập quản trị"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "Đặt bộ phận như một đơn vị quản trị độc lập"
 
@@ -3930,7 +3878,7 @@ msgstr "Văn bản mô tả cho bộ phận"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Các danh mục"
@@ -3940,75 +3888,75 @@ msgstr "Các danh mục"
 msgid "Category for this subtree"
 msgstr "Các danh mục cho cây con"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Vị trí"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Bang"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "Xác định xem tập cây con này ở đâu"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "Vị trí của cây con"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "Địa chỉ bưu điện của cây con này"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "Đặt số điện thoại của cây con này"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "Số fax"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Đặt số fax của cây con này"
 
@@ -4022,8 +3970,8 @@ msgid "Domain Component"
 msgstr "Admin miền"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "Các bộ phận"
 
@@ -4047,7 +3995,7 @@ msgid "Organization name"
 msgstr "Tổ chức"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "Địa chỉ theo bưu điện"
 
@@ -4077,44 +4025,44 @@ msgstr "Tên của cây con được tạo"
 msgid "Name of country to create"
 msgstr "Tên của cây con được tạo"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr "Không thể tìm được một tag chưa được dùng cho đơn vị quản trị này!"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Tagging '%s'."
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Chuyển từ '%s' đến '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Thất bại trong việc copy %s, bãi bỏ thao tác"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "Tên bộ phận"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "Số điện thoại"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Đối tượng '%s' đã bị tag"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Thêm tag (%s) vào đối tượng '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Bỏ tag từ đối tượng '%s'"
@@ -4180,7 +4128,7 @@ msgid "ACL Templates"
 msgstr "Các mẫu ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr "Các vai trò kiểm soát truy cập"
 
@@ -4188,52 +4136,52 @@ msgstr "Các vai trò kiểm soát truy cập"
 msgid "Edit AC roles"
 msgstr "Hiệu chỉnh các vai trò ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr "Xác lập lại ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr "Không có cài đặt ACL cho mục này"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL cho các đối tượng sau: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr "Hiệu chính mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr "Xác lập mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho'%s', vùng là '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr "Đối tượng đang được sử dụng"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Vai trò này không thể bị xóa bỏ trong khi nó vẫn đang được sử dụng bởi các "
 "đối tượng:"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Vai trò"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 #, fuzzy
 msgid "Permissions"
 msgstr "Cho phép"
@@ -4268,27 +4216,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Hiệu chỉnh thiết lập tổ chức của người sử dụng "
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "Nữ"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "Nam"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr "Không thể tải file lên!"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 msgid "Serial number"
 msgstr "Số seri"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4296,233 +4244,233 @@ msgstr ""
 "(Một số loại chứng nhận hiện không được hỗ trợ và có thể hiển thị 'không hợp "
 "lệ'.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Giấy chứng nhận có hiệu lực từ %s đến %s và hiện tại đang là %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "hợp lệ"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "không hợp lệ"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "Không có giấy chứng nhận nào được cài đặt"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 msgid "The selected password method is no longer available."
 msgstr "Phương pháp lập mật khẩu được chọn này không còn ở đây."
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 msgid "The selected password method requires initial configuration!"
 msgstr "Phương pháp lập mật khẩu được chọn yêu cầu cấu hình ban đầu!"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Ngày sinh"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 msgid "Cannot open certificate!"
 msgstr "Không mở được giấy chứng nhận!"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Mô tả căn nhà"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Nghề nghiệp"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Lần cung cấp cuối"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Địa phương của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Mô tả đơn vị "
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Lĩnh vực chuyên môn"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Danh xưng chức năng"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Số seri chứng nhận"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Hiển thị với tất cả mọi người"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Phố"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Mã bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 msgid "Generic user settings"
 msgstr "Thiết lập chung của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 msgid "User identification"
 msgstr "Chứng nhận người dùng"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Chức danh học thuật"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Giới tính"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Ảnh của người sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 msgid "Telefon number"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 msgid "Pager number"
 msgstr "Số máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Mobile number"
 msgstr "Số di động"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Fax number"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "Phương pháp lập mật khẩu"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 msgid "User certificates"
 msgstr "Giấy phép của người dùng"
 
@@ -4555,66 +4503,69 @@ msgstr "Tên Mẫu"
 msgid "Preferred langage"
 msgstr "Ngôn ngữ muốn dùng"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Chọn một cây con để cho người dùng vào"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "Số điện thoại riêng"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "Kho lưu mật khẩu"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Các giấy phép"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Hiệu chỉnh các giấy phép"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "Xin hãy sử dụng Phone Tab"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "Chọn một cây con để cho người dùng vào"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "Chọn một cơ sở"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Thiết lập của người dùng"
@@ -5209,6 +5160,10 @@ msgstr "Sau khi di trú"
 msgid "Migrate"
 msgstr "Di trú"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "Đóng"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6702,6 +6657,18 @@ 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 "Inconsistent DN encoding detected: '%s'"
+#~ msgstr "Việc mã hóa DN không thống nhất phát hiện: '%s'"
+
+#~ msgid "Choose a base"
+#~ msgstr "Chọn một gốc"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Chọn một cây thư mục con để đặt nhóm vào"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "Lựa chọn cây con để đặt bộ phận này vào  "
+
 #~ msgid "Show %s"
 #~ msgstr "Hiển thị %s"
 

diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
index 110e3f0f1cee72251c01ac0f14384ada1493e073..407c19c0f67c7b644f470c7c04ceb4fec3b65703 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-28 22:24+0100\n"
+"POT-Creation-Date: 2010-02-01 16:40+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -16,57 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ihtml/themes/default/baseSelect-list.tpl:13
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
-#: setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "位置"
-
-#: ihtml/themes/default/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: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/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
-msgstr "过滤器"
-
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
@@ -75,8 +24,8 @@ 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:1001
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/personal/posix/class_posixAccount.inc:793
@@ -113,7 +62,7 @@ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -190,7 +139,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
+#: include/utils/class_msgPool.inc:327
 #, php-format
 msgid "Save"
 msgstr "保存"
@@ -233,7 +182,7 @@ msgid ""
 "and let me use filters instead"
 msgstr "忽略错误并显示在定义限制长度内的所有条目，并让我使用过滤器。"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
 #, php-format
 msgid "Set"
 msgstr "设置"
@@ -242,25 +191,25 @@ msgstr "设置"
 msgid "Assigned ACL for current entry"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:45
+#: ihtml/themes/default/acl.tpl:12 plugins/admin/acl/acl_role.tpl:38
 #, fuzzy
 msgid "New ACL"
 msgstr "新"
 
-#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:51
+#: ihtml/themes/default/acl.tpl:17 plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "ACL type"
 msgstr "分类类型"
 
 #: ihtml/themes/default/acl.tpl:19 ihtml/themes/default/acl.tpl:24
-#: plugins/admin/acl/acl_role.tpl:51
+#: plugins/admin/acl/acl_role.tpl:44
 #, fuzzy
 msgid "Select an acl type"
 msgstr "选择一个位置"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -287,7 +236,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
 msgid "Members"
 msgstr "成员"
 
@@ -295,7 +244,7 @@ msgstr "成员"
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:56
+#: ihtml/themes/default/acl.tpl:104 plugins/admin/acl/acl_role.tpl:49
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "可用软件包列表"
@@ -349,130 +298,6 @@ msgstr "修改口令"
 msgid "Click here to change your password"
 msgstr "点击这里来修改您的口令"
 
-#: ihtml/themes/default/baseSelect-list.xml:11
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "部门列表"
-
-#: ihtml/themes/default/baseSelect-list.xml:15
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, fuzzy
-msgid "Domain"
-msgstr "于域"
-
-#: ihtml/themes/default/baseSelect-list.xml:23
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "域管理员"
-
-#: ihtml/themes/default/baseSelect-list.xml:31
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "国家"
-
-#: ihtml/themes/default/baseSelect-list.xml:39
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "位置"
-
-#: ihtml/themes/default/baseSelect-list.xml:47
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1626
-#: plugins/personal/generic/generic.tpl:285
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "组织/公司"
-
-#: ihtml/themes/default/baseSelect-list.xml:55
-#: ihtml/themes/default/baseSelect-list.xml:71
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/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:237
-#: plugins/personal/generic/class_user.inc:1627
-#: plugins/personal/generic/generic.tpl:293
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "部门"
-
-#: ihtml/themes/default/baseSelect-list.xml:79
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/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/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
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr "描述"
-
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc: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
-msgid "Actions"
-msgstr "动作"
-
-#: ihtml/themes/default/baseSelect-list.xml:104
-#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
-#: include/class_acl.inc:548 include/class_sortableListing.inc:192
-#: include/class_sortableListing.inc:194
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "编辑"
-
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -508,10 +333,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
-#: include/class_acl.inc:778 include/class_acl.inc:785
-#: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
+#: include/class_acl.inc:779 include/class_acl.inc:786
+#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
+#: plugins/admin/departments/class_department.inc:560
 msgid "Object"
 msgstr "对象"
 
@@ -553,8 +378,8 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:500
+#: plugins/admin/departments/class_department.inc:582
 msgid "Continue"
 msgstr "继续"
 
@@ -563,17 +388,17 @@ msgstr "继续"
 #: html/index.php:228 include/class_management.inc:447
 #: include/class_management.inc:583 include/class_management.inc:915
 #: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3393 include/functions.inc:3401
-#: include/functions.inc:3413 include/functions.inc:3417
-#: include/functions.inc:3432 include/functions.inc:3441
-#: include/functions.inc:3501 include/class_tabs.inc:56
-#: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
-#: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
-#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
-#: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
+#: include/class_listing.inc:477 include/functions.inc:3349
+#: include/functions.inc:3363 include/functions.inc:3393
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441 include/functions.inc:3501
+#: include/class_tabs.inc:56 include/class_plugin.inc:658
+#: include/class_plugin.inc:700 include/class_plugin.inc:743
+#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
+#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -584,18 +409,24 @@ 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: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
-#: plugins/personal/generic/class_user.inc:795
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1163
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/admin/ogroups/class_ogroup.inc:500
+#: plugins/admin/groups/class_group.inc:539
+#: plugins/admin/groups/class_group.inc:545
+#: plugins/admin/groups/class_group.inc:753
+#: plugins/admin/groups/class_group.inc:894
+#: plugins/admin/groups/class_group.inc:899
+#: plugins/admin/groups/class_group.inc:1230
+#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:754
+#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1699
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -603,11 +434,17 @@ msgstr "继续"
 msgid "Error"
 msgstr "错误"
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+msgid "Information"
+msgstr "提示信息"
+
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -753,21 +590,6 @@ msgstr ""
 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
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
-#: plugins/personal/posix/groupSelect/group-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "过滤器"
-
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -798,7 +620,7 @@ msgstr ""
 
 #: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Fatal error"
 msgstr "终端服务器"
@@ -824,8 +646,8 @@ msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
 #: 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:668
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -835,7 +657,7 @@ msgstr "配置文件"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问！"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "Password method"
 msgstr "口令存储"
@@ -862,10 +684,10 @@ msgstr "输入的新口令太短了。"
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1306
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -924,31 +746,31 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
 #: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
 #: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:476 include/functions.inc:511
-#: include/functions.inc:519 include/functions.inc:564
-#: include/functions.inc:815 include/functions.inc:864
-#: include/functions.inc:921 include/functions.inc:974
-#: include/functions.inc:3002 include/functions.inc:3275
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc: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
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:692
-#: plugins/personal/generic/class_user.inc:1078
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
+#: include/class_acl.inc:1318 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:564 include/functions.inc:815
+#: include/functions.inc:864 include/functions.inc:921
+#: include/functions.inc:974 include/functions.inc:3002
+#: include/functions.inc:3275 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
+#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
+#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
+#: include/class_plugin.inc:1537 include/class_ldap.inc:752
+#: include/class_ldap.inc:1218 include/class_config.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:915
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/departments/class_department.inc:218
+#: plugins/admin/departments/class_department.inc:415
+#: plugins/admin/departments/class_department.inc:688
+#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/acl/class_aclRole.inc:613
+#: plugins/admin/acl/class_aclRole.inc:653
+#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/personal/generic/class_user.inc:685
+#: plugins/personal/generic/class_user.inc:1065
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
@@ -1097,9 +919,9 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1560
+#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
+#: include/class_plugin.inc:1600
 #: plugins/admin/users/class_userManagement.inc:221
 #: plugins/admin/users/class_userManagement.inc:616
 #, fuzzy
@@ -1114,14 +936,14 @@ msgstr "允许"
 msgid "Permission error"
 msgstr "允许"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1546
+#: include/class_management.inc:427 include/class_plugin.inc:1560
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "您无权删除这个用户！"
 
 #: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
+#: include/class_management.inc:524 include/class_plugin.inc:1572
+#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "您无权删除这个用户！"
@@ -1166,156 +988,166 @@ msgid ""
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_acl.inc:26
+#: include/class_acl.inc:27
 #, fuzzy
 msgid "Access control"
 msgstr "访问选项"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:28 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "访问选项"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
 #, fuzzy
 msgid "All categories"
 msgstr "添加分类"
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:221
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "One level"
 msgstr "日志级别"
 
-#: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 include/class_acl.inc:228
+#: plugins/admin/acl/class_aclRole.inc:136
 #, fuzzy
 msgid "Current object"
 msgstr "创建新 FAI 对象"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
 #, fuzzy
 msgid "Complete subtree"
 msgstr "忽略子树"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:225 include/class_acl.inc:228
+#: include/class_acl.inc:226 include/class_acl.inc:229
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1600
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "用户"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
+#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
 #: 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:239
-#: include/class_listing.inc:995 include/class_listing.inc:997
+#: include/class_acl.inc:494 include/class_listing.inc:239
+#: include/class_listing.inc:996 include/class_listing.inc:998
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:394
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "上"
 
-#: include/class_acl.inc:495 include/class_listing.inc:239
+#: include/class_acl.inc:496 include/class_listing.inc:239
 #: include/class_sortableListing.inc:225
-#: plugins/admin/acl/class_aclRole.inc:396
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "关闭"
 
-#: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:501 include/class_acl.inc:549
+#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/acl/class_aclRole.inc:377
+#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+msgid "Edit"
+msgstr "编辑"
+
+#: include/class_acl.inc:501 include/class_acl.inc:505
+#: include/class_acl.inc:1254 include/class_acl.inc:1255
+#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
+#: plugins/admin/acl/class_aclRole.inc:382
+#: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "ACL"
 
-#: include/class_acl.inc:504 include/class_acl.inc:552
+#: include/class_acl.inc:505 include/class_acl.inc:553
 #: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "删除"
 
-#: include/class_acl.inc:540
+#: include/class_acl.inc:541
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:543
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:549 include/class_acl.inc:553
 #, fuzzy
 msgid "category ACL"
 msgstr "分类"
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:603
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:773 include/class_acl.inc:780
+#: include/class_acl.inc:774 include/class_acl.inc:781
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "高级电话设置"
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:798
 #, fuzzy
 msgid "Create objects"
 msgstr "创建新 FAI 对象"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:799
 #, fuzzy
 msgid "Move objects"
 msgstr "成员对象"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:800
 #, fuzzy
 msgid "Remove objects"
 msgstr "成员对象"
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:802
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_acl.inc:805 include/class_acl.inc:910
-#: include/class_acl.inc:914
+#: include/class_acl.inc:806 include/class_acl.inc:911
+#: include/class_acl.inc:915
 msgid "read"
 msgstr "读"
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:807 include/class_acl.inc:913
+#: include/class_acl.inc:916
 msgid "write"
 msgstr "写"
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:811
 #, fuzzy
 msgid "Complete object"
 msgstr "成员对象"
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:955 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:604 include/functions.inc:790
 #: include/functions.inc:908 include/functions.inc:1306
@@ -1328,166 +1160,153 @@ msgstr "成员对象"
 msgid "Internal error"
 msgstr "终端服务器"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:955
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "未知 FAIstate %s"
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:998
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "未知 FAIstate %s"
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1058 include/class_acl.inc:1060
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "角色"
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1060
 #, fuzzy
 msgid "unknown role"
 msgstr "! 未知 id"
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1068
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "inactive"
 msgstr "活动"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1085
 #, fuzzy
 msgid "No members"
 msgstr "组成员"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1255
 #, fuzzy
 msgid "Access control list"
 msgstr "访问选项"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1260
 #, fuzzy
 msgid "ACL roles"
 msgstr "MAC 地址"
 
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr "关闭"
+#: include/class_session.inc:76 include/class_session.inc:101
+#: include/class_session.inc:127
+#, fuzzy
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
+#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
+#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
+#: setup/setup_migrate.tpl:551
+#, fuzzy
+msgid "Select all"
+msgstr "选择"
+
+#: include/class_listing.inc:519
+#, fuzzy
+msgid "created by"
+msgstr "创建"
+
+#: include/class_listing.inc:988
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
-#: include/class_listing.inc:989 include/class_baseSelector.inc:136
+#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_baseSelector.inc:167
 msgid "Root"
 msgstr "根"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
+#: include/class_listing.inc:996
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
+#: include/class_listing.inc:1004
 msgid "Go to users department"
 msgstr "转到用户部门"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
-#: include/class_listing.inc:1005
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_listing.inc:1011
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
-#: include/class_baseSelector.inc:179
+#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
 msgid "Submit"
 msgstr "提交"
 
-#: include/class_MultiSelectWindow.inc:553
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
-msgstr ""
-
-#: include/class_session.inc:76 include/class_session.inc:101
-#: include/class_session.inc:127
-#, fuzzy
-msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
-
-#: include/class_baseSelectDialog.inc:28
-#, fuzzy
-msgid "Choose a base"
-msgstr "选择一个位置"
-
-#: 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
-#: setup/setup_migrate.tpl:551
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
-#: include/class_listing.inc:521
-#, fuzzy
-msgid "created by"
-msgstr "创建"
+#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
+msgid "Actions"
+msgstr "动作"
 
-#: include/class_listing.inc:1375 include/class_listing.inc:1425
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1376 include/class_listing.inc:1426
+#: include/class_plugin.inc:2084
 #, fuzzy
 msgid "Copy"
 msgstr "复制"
 
-#: include/class_listing.inc:1381 include/class_listing.inc:1415
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1382 include/class_listing.inc:1416
+#: include/class_plugin.inc:2088
 #, fuzzy
 msgid "Cut"
 msgstr "剪切"
 
-#: include/class_listing.inc:1389 include/class_listing.inc:1391
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
+#: include/class_listing.inc:1390 include/class_listing.inc:1392
+#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1415 include/class_plugin.inc:2028
+#: include/class_listing.inc:1416 include/class_plugin.inc:2042
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1425 include/class_plugin.inc:2036
+#: include/class_listing.inc:1426 include/class_plugin.inc:2050
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1457 include/class_listing.inc:1459
+#: include/class_listing.inc:1458 include/class_listing.inc:1460
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "删除记录"
 
-#: include/class_listing.inc:1473
+#: include/class_listing.inc:1474
 #, fuzzy
 msgid "Export list"
 msgstr "导出"
 
-#: include/class_listing.inc:1508 include/class_listing.inc:1509
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1509 include/class_listing.inc:1510
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1518 include/class_plugin.inc:2009
+#: include/class_listing.inc:1519 include/class_plugin.inc:2023
 #, fuzzy
 msgid "Create snapshot"
 msgstr "创建 nagios 账户"
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2010
+#: include/class_listing.inc:1520 include/class_plugin.inc:2024
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "创建新 FAI 对象"
@@ -1563,7 +1382,7 @@ msgid ""
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
 msgid "Configure"
 msgstr "配置"
 
@@ -1806,6 +1625,42 @@ msgstr "删除记录"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/generic.tpl:15
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:49
+#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/locality.tpl:19
+#: plugins/admin/departments/generic.tpl:19
+#: plugins/admin/departments/class_domain.inc:59
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:298
+#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "描述"
+
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1913,44 +1768,44 @@ msgstr "类型"
 msgid "Arguments"
 msgstr "参数"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "在子树中查找"
 
-#: include/class_plugin.inc:512
+#: include/class_plugin.inc:509
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1814
 msgid "from"
 msgstr "从"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
 #, fuzzy
 msgid "Restore"
 msgstr "仓库"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2042
 msgid "cut"
 msgstr "剪切"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2050
 msgid "copy"
 msgstr "复制"
 
@@ -1995,329 +1850,329 @@ msgstr "继续"
 msgid "XML error"
 msgstr "LDAP 错误:"
 
-#: include/utils/class_msgPool.inc:15
+#: include/utils/class_msgPool.inc:16
 #, fuzzy, php-format
 msgid "Select to list objects of type '%s'."
 msgstr "选择要添加的对象"
 
-#: include/utils/class_msgPool.inc:17
+#: include/utils/class_msgPool.inc:18
 #, fuzzy, php-format
 msgid "Select to list objects containig '%s'."
 msgstr "选择查看包含用户的组"
 
-#: include/utils/class_msgPool.inc:19
+#: include/utils/class_msgPool.inc:20
 #, fuzzy, php-format
 msgid "Select to list objects that have '%s' enabled"
 msgstr "选择要添加的对象"
 
-#: include/utils/class_msgPool.inc:21
+#: include/utils/class_msgPool.inc:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to search within subtrees"
 msgstr "选择在子树中查询"
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:34
 msgid "This object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:35
+#: include/utils/class_msgPool.inc:36
 #, php-format
 msgid "This '%s' object will be deleted!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:40
+#: include/utils/class_msgPool.inc:41
 #, php-format
 msgid "This object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:42
+#: include/utils/class_msgPool.inc:43
 #, php-format
 msgid "This '%s' object will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:47
+#: include/utils/class_msgPool.inc:48
 msgid "This object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:49
+#: include/utils/class_msgPool.inc:50
 #, php-format
 msgid "This '%s' object will be deleted:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:53
+#: include/utils/class_msgPool.inc:54
 #, php-format
 msgid "These objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55
+#: include/utils/class_msgPool.inc:56
 #, php-format
 msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:63
+#: include/utils/class_msgPool.inc:64
 #, fuzzy
 msgid "You have no permission to delete this object!"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
+#: include/utils/class_msgPool.inc:68 include/utils/class_msgPool.inc:72
 #, fuzzy
 msgid "You have no permission to delete the object:"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:74
+#: include/utils/class_msgPool.inc:75
 #, fuzzy
 msgid "You have no permission to delete these objects:"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:81
+#: include/utils/class_msgPool.inc:82
 #, fuzzy
 msgid "You have no permission to create this object!"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
+#: include/utils/class_msgPool.inc:86 include/utils/class_msgPool.inc:90
 #, fuzzy
 msgid "You have no permission to create the object:"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:92
+#: include/utils/class_msgPool.inc:93
 #, fuzzy
 msgid "You have no permission to create these objects:"
 msgstr "您无权删除这个部门。"
 
-#: include/utils/class_msgPool.inc:99
+#: include/utils/class_msgPool.inc:100
 #, fuzzy
 msgid "You have no permission to modify this object!"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
+#: include/utils/class_msgPool.inc:104 include/utils/class_msgPool.inc:108
 #, fuzzy
 msgid "You have no permission to modify the object:"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:111
 #, fuzzy
 msgid "You have no permission to modify these objects:"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:117
+#: include/utils/class_msgPool.inc:118
 #, fuzzy
 msgid "You have no permission to view this object!"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
+#: include/utils/class_msgPool.inc:122 include/utils/class_msgPool.inc:126
 #, fuzzy
 msgid "You have no permission to view the object:"
 msgstr "您无权在此 'Base' 下创建一个电话"
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:129
 #, fuzzy
 msgid "You have no permission to view these objects:"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:135
+#: include/utils/class_msgPool.inc:136
 #, fuzzy
 msgid "You have no permission to move this object!"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
+#: include/utils/class_msgPool.inc:140 include/utils/class_msgPool.inc:144
 #, fuzzy
 msgid "You have no permission to move the object:"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:147
 #, fuzzy
 msgid "You have no permission to move these objects:"
 msgstr "您无权删除这个黑名单。"
 
-#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
-#: include/utils/class_msgPool.inc:186
+#: include/utils/class_msgPool.inc:157 include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:187
 #, fuzzy
 msgid "Connection information"
 msgstr "个人信息"
 
-#: include/utils/class_msgPool.inc:158
+#: include/utils/class_msgPool.inc:159
 #, fuzzy, php-format
 msgid "Cannot connect to %s database!"
 msgstr "无法连接到数据库!"
 
-#: include/utils/class_msgPool.inc:170
+#: include/utils/class_msgPool.inc:171
 #, fuzzy, php-format
 msgid "Cannot select %s database!"
 msgstr "无法选择数据库！"
 
-#: include/utils/class_msgPool.inc:176
+#: include/utils/class_msgPool.inc:177
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:188
+#: include/utils/class_msgPool.inc:189
 #, fuzzy, php-format
 msgid "Cannot query %s database!"
 msgstr "无法选择数据库！"
 
-#: include/utils/class_msgPool.inc:194
+#: include/utils/class_msgPool.inc:195
 #, fuzzy, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr "“传真”字段包含一个无效电话号码"
 
-#: include/utils/class_msgPool.inc:200
+#: include/utils/class_msgPool.inc:201
 #, fuzzy, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "命令 '%s'，作为插件 '%s' 的 CHECK hook 好像并不存在。"
 
-#: include/utils/class_msgPool.inc:207
+#: include/utils/class_msgPool.inc:208
 #, fuzzy, php-format
 msgid "'%s' command is invalid!"
 msgstr "指定的 branch 名称无效。"
 
-#: include/utils/class_msgPool.inc:209
+#: include/utils/class_msgPool.inc:210
 #, php-format
 msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:211
+#: include/utils/class_msgPool.inc:212
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:213
+#: include/utils/class_msgPool.inc:214
 #, fuzzy, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "指定的 branch 名称无效。"
 
-#: include/utils/class_msgPool.inc:221
+#: include/utils/class_msgPool.inc:222
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "无法选择数据库！"
 
-#: include/utils/class_msgPool.inc:223
+#: include/utils/class_msgPool.inc:224
 #, php-format
 msgid "Cannot execute '%s' command (%s) for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:225
+#: include/utils/class_msgPool.inc:226
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:227
+#: include/utils/class_msgPool.inc:228
 #, fuzzy, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "无法选择数据库！"
 
-#: include/utils/class_msgPool.inc:235
+#: include/utils/class_msgPool.inc:236
 #, fuzzy, php-format
 msgid "Value for '%s' is too large!"
 msgstr "'UID' 赋值太小。"
 
-#: include/utils/class_msgPool.inc:237
+#: include/utils/class_msgPool.inc:238
 #, fuzzy, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "提供的 'shadowMin' 应该小于'shadowMax'。"
 
-#: include/utils/class_msgPool.inc:245
+#: include/utils/class_msgPool.inc:246
 #, fuzzy, php-format
 msgid "Value for '%s' is too small!"
 msgstr "'UID' 赋值太小。"
 
-#: include/utils/class_msgPool.inc:247
+#: include/utils/class_msgPool.inc:248
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:254
+#: include/utils/class_msgPool.inc:255
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:260
+#: include/utils/class_msgPool.inc:261
 #, fuzzy, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "数据库中已经有同样登录名的用户。"
 
-#: include/utils/class_msgPool.inc:266
+#: include/utils/class_msgPool.inc:267
 #, fuzzy, php-format
 msgid "The required field '%s' is empty!"
 msgstr "需要的“姓名”字段没有设置"
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:275
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:291
+#: include/utils/class_msgPool.inc:292
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "“姓名”字段包含无效字符。"
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:293
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "不允许修改口令"
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:296
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "“姓名”字段包含无效字符。"
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:303
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "删除打印机扩展"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:250
 #: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "添加"
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:333
 #, fuzzy, php-format
 msgid "Add %s"
 msgstr "添加"
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:339
 #, fuzzy, php-format
 msgid "Delete %s"
 msgstr "删除"
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:345
 #, fuzzy, php-format
 msgid "Set %s"
 msgstr "设置"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit..."
 msgstr "编辑"
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:351
 #, fuzzy, php-format
 msgid "Edit %s..."
 msgstr "编辑用户"
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:357
 msgid "Back"
 msgstr "返回"
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:377
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "该账户没有有效的 Gosa 扩展。"
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:383
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr "这个账户已经启用 posix 功能。要禁用请点击下面按钮。"
 
-#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
+#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2325,13 +2180,13 @@ msgid ""
 msgstr ""
 "这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
 
-#: include/utils/class_msgPool.inc:401
+#: include/utils/class_msgPool.inc:402
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr "这个账户已经启用 posix 功能。要启用请点击下面按钮。"
 
-#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
+#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2339,231 +2194,236 @@ msgid ""
 msgstr ""
 "这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
 
-#: include/utils/class_msgPool.inc:419
+#: include/utils/class_msgPool.inc:420
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "应用程序设置"
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:426
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Posix 设置"
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:432
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "January"
 msgstr "一月"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "February"
 msgstr "二月"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "March"
 msgstr "三月"
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
 msgid "April"
 msgstr "四月"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "May"
 msgstr "五月"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "June"
 msgstr "六月"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "July"
 msgstr "七月"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "August"
 msgstr "八月"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
 msgid "September"
 msgstr "九月"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "October"
 msgstr "十月"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "November"
 msgstr "十一月"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:440
 msgid "December"
 msgstr "十二月"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Sunday"
 msgstr "姓"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Monday"
 msgstr "月"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 #, fuzzy
 msgid "Wednesday"
 msgstr "星期三"
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:446
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "Mysql 查询失败。"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "read operation"
 msgstr "邮件选项"
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:461
 #, fuzzy
 msgid "modify operation"
 msgstr "个人信息"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "delete operation"
 msgstr "选择查看工作站"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "search operation"
 msgstr "账号过期于"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:462
 #, fuzzy
 msgid "authentication"
 msgstr "Nagios 鉴权"
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:465
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "Mysql 查询失败。"
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:467
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "Mysql 查询失败。"
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:482
 #, fuzzy
 msgid "Upload failed!"
 msgstr "用户登录失败。LDAP 服务器返回 '%s'。"
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Logging DB 用户"
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:492
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:494
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:500 include/utils/class_msgPool.inc:503
+#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:506
+#: include/utils/class_msgPool.inc:507
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:509
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:515
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:521
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:527
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:533
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:539
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:545
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "转到根部门"
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:551
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:557
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "检查 iconv 支持"
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:563
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:569
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
+#: include/utils/class_msgPool.inc:575
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
@@ -2727,12 +2587,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "请看一下 GOsa 日志文件。"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:992
-#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/groups/class_group.inc:1183
 #: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/class_department.inc:595
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "通用配置"
@@ -2783,18 +2643,31 @@ msgstr "FTP"
 msgid "Group"
 msgstr "组"
 
+#: 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:237
+#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/generic.tpl:288
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+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: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
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/class_user.inc:1730
-#: plugins/personal/generic/generic.tpl:344
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/admin/departments/generic.tpl:82
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1729
+#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/generic.tpl:520
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
@@ -2897,19 +2770,19 @@ 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/class_ogroup.inc:799
+#: plugins/admin/ogroups/class_ogroup.inc:814
+#: plugins/admin/ogroups/class_ogroup.inc:1002
 #: 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/groups/class_group.inc:1054
+#: plugins/admin/groups/class_group.inc:1065
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1084
+#: plugins/admin/groups/class_group.inc:1098
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1192
 #: plugins/admin/users/class_userManagement.inc:412
 #: plugins/admin/users/class_userManagement.inc:459
 #: plugins/admin/departments/class_domain.inc:43
@@ -2939,25 +2812,73 @@ msgstr "用户"
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/departments/class_department.inc:288
+#: plugins/admin/departments/class_department.inc:290
+#: plugins/admin/departments/class_department.inc:295
+#: plugins/admin/departments/class_department.inc:302
+#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/acl/class_aclRole.inc:733
+#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:755 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/generic/class_user.inc:1271
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1744
 #: 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-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "位置"
+
+#: 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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "过滤器"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
 #, fuzzy
 msgid "Show department"
@@ -3007,7 +2928,7 @@ msgid ""
 msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:998
+#: plugins/admin/ogroups/class_ogroup.inc:999
 msgid "Object groups"
 msgstr "对象组"
 
@@ -3033,108 +2954,108 @@ msgstr "模板"
 msgid "Windows Install"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:249
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:385
 #: 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:393
+#: plugins/admin/ogroups/class_ogroup.inc:387
 msgid "too many different objects!"
 msgstr "太多不同对象！"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:389
 msgid "users"
 msgstr "用户"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:390
 msgid "groups"
 msgstr "组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:391
 msgid "applications"
 msgstr "应用程序"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "departments"
 msgstr "部门"
 
-#: plugins/admin/ogroups/class_ogroup.inc:399
+#: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "servers"
 msgstr "服务器"
 
-#: plugins/admin/ogroups/class_ogroup.inc:400
+#: plugins/admin/ogroups/class_ogroup.inc:394
 msgid "workstations"
 msgstr "工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:401
+#: plugins/admin/ogroups/class_ogroup.inc:395
 #, fuzzy
 msgid "winstations"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:396
 msgid "terminals"
 msgstr "终端"
 
-#: plugins/admin/ogroups/class_ogroup.inc:403
+#: plugins/admin/ogroups/class_ogroup.inc:397
 msgid "phones"
 msgstr "电话"
 
-#: plugins/admin/ogroups/class_ogroup.inc:404
+#: plugins/admin/ogroups/class_ogroup.inc:398
 msgid "printers"
 msgstr "打印机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "禁用"
 
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/groups/class_groupGeneric.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "完全访问权限"
 
-#: plugins/admin/ogroups/class_ogroup.inc:452
-#: plugins/admin/groups/class_groupGeneric.inc:435
+#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/groups/class_group.inc:434
 #: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:636
+#: plugins/admin/ogroups/class_ogroup.inc:632
 msgid "Non existing dn:"
 msgstr "不存在的 dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:793
+#: plugins/admin/ogroups/class_ogroup.inc:789
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:819
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "您最多只能组合两个不同的对象类！"
 
-#: plugins/admin/ogroups/class_ogroup.inc:993
+#: plugins/admin/ogroups/class_ogroup.inc:994
 #, fuzzy
 msgid "Object group generic"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:1005
 #, fuzzy
 msgid "Sytem trust"
 msgstr "信赖的系统"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:1006
 #, fuzzy
 msgid "Member"
 msgstr "成员"
@@ -3154,36 +3075,19 @@ msgstr "组名称"
 msgid "Descriptive text for this group"
 msgstr "组的描述文字"
 
-#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/groups/generic.tpl:43
-#: plugins/admin/acl/acl_role.tpl:31
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
-
-#: plugins/admin/ogroups/generic.tpl:34 plugins/admin/groups/generic.tpl:49
-#: plugins/admin/departments/locality.tpl:37
-#: plugins/admin/departments/generic.tpl:49
-#: plugins/admin/departments/domain.tpl:37
-#: plugins/admin/departments/country.tpl:37
-#: plugins/admin/departments/dcObject.tpl:37
-#: plugins/admin/departments/organization.tpl:49
-#: plugins/admin/acl/acl_role.tpl:37 plugins/personal/generic/generic.tpl:174
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1188
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1200
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "信赖的系统"
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:166
-#: plugins/admin/groups/generic.tpl:200 plugins/personal/posix/generic.tpl:141
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
 #: plugins/personal/posix/generic.tpl:169
 msgid "Trust mode"
 msgstr "信赖模式"
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr "成员对象"
 
@@ -3333,6 +3237,12 @@ msgstr "服务器"
 msgid "Select objects to add"
 msgstr "选择要添加的对象"
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+#: plugins/personal/posix/posix_groups.tpl:21
+msgid "Filters"
+msgstr "过滤器"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr "选择查看部门对象"
@@ -3388,16 +3298,16 @@ msgstr ""
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: 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
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1742
+#: plugins/personal/generic/class_user.inc:1281
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1606
+#: plugins/personal/generic/class_user.inc:1741
 msgid "Given name"
 msgstr "名"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1605
 msgid "Surname"
 msgstr "姓"
 
@@ -3412,47 +3322,47 @@ msgstr ""
 msgid "Posix name of the group"
 msgstr "组的 posix 名称"
 
-#: plugins/admin/groups/generic.tpl:65
+#: plugins/admin/groups/generic.tpl:59
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr "一般 ID 是自动创建的，要手工设置请选择"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:62
 #: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "强制 GID"
 
-#: plugins/admin/groups/generic.tpl:71
+#: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "强制 ID 编号"
 
-#: plugins/admin/groups/generic.tpl:81 plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/generic.tpl:75 plugins/admin/groups/generic.tpl:102
 msgid "Select to create a samba conform group"
 msgstr "选择创建一个 samba 确认组"
 
-#: plugins/admin/groups/generic.tpl:93 plugins/admin/groups/generic.tpl:116
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr "于域"
 
-#: plugins/admin/groups/generic.tpl:137
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr "成员属于电话应答组"
 
-#: plugins/admin/groups/generic.tpl:152
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr "成员属于 nagios 组"
 
-#: plugins/admin/groups/generic.tpl:242
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr "组成员"
 
-#: plugins/admin/groups/generic.tpl:249
+#: plugins/admin/groups/generic.tpl:243
 #, fuzzy
 msgid "In all groups"
 msgstr "显示邮件组"
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:246
 #, fuzzy
 msgid "Not in all groups"
 msgstr "显示邮件组"
@@ -3473,70 +3383,88 @@ msgstr "显示 samba 用户组"
 msgid "Show mail groups"
 msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:161
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "组设置"
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "组列表"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "主要用户组"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "服务器"
+
+#: plugins/admin/groups/class_group.inc:162
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr "无法在 LDAP 或您的配置文件中查找这个组 SID。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr "域管理员"
 
-#: plugins/admin/groups/class_groupGeneric.inc:401
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr "域用户"
 
-#: plugins/admin/groups/class_groupGeneric.inc:402
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr "域名 guests"
 
-#: plugins/admin/groups/class_groupGeneric.inc:407
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr "特殊组 (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:541
+#: plugins/admin/groups/class_group.inc:540
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_group.inc:546
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:625
+#: plugins/admin/groups/class_group.inc:624
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! 未知 id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:668
+#: plugins/admin/groups/class_group.inc:667
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_group.inc:894
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_group.inc:899
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1001
+#: plugins/admin/groups/class_group.inc:1003
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/groups/class_groupGeneric.inc:1105
-#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1196
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3544,54 +3472,36 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_group.inc:1184
 #, fuzzy
 msgid "Generic group settings"
 msgstr "组设置"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1186
+#: plugins/admin/groups/class_group.inc:1198
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1187
+#: plugins/admin/groups/class_group.inc:1199
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba 主目录"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1189
+#: plugins/admin/groups/class_group.inc:1201
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "成员属于电话应答组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1190
+#: plugins/admin/groups/class_group.inc:1202
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios 账号"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
+#: plugins/admin/groups/class_group.inc:1204
 #, fuzzy
 msgid "Group member"
 msgstr "组成员"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "组设置"
-
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "组列表"
-
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "主要用户组"
-
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "服务器"
-
 #: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr "组管理"
@@ -3869,6 +3779,52 @@ msgstr ""
 "最好在执行这个操作之前，保存当前 LDAP 树中的内容到一个文件。所以，如果您已经"
 "这么做了，按“删除”继续或者按“取消”退出。"
 
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "部门列表"
+
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:177
+#, fuzzy
+msgid "Domain"
+msgstr "于域"
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "域管理员"
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "国家"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+#, fuzzy
+msgid "Locality"
+msgstr "位置"
+
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/generic.tpl:280
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "组织/公司"
+
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 #, fuzzy
@@ -3889,36 +3845,27 @@ msgstr "要创建子树的名称"
 msgid "Descriptive text for department"
 msgstr "部门描述文件"
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/domain.tpl:31
-#: plugins/admin/departments/country.tpl:31
-#: plugins/admin/departments/dcObject.tpl:31
-#: plugins/admin/departments/organization.tpl:43
-msgid "Choose subtree to place department in"
-msgstr "选择放置部门的子树"
-
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/locality.tpl:44
+#: plugins/admin/departments/generic.tpl:108
 #: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/class_localityGeneric.inc:90
 #: plugins/admin/departments/class_organizationGeneric.inc:129
 #: plugins/admin/departments/class_countryGeneric.inc:90
 #: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
+#: plugins/admin/departments/domain.tpl:44
+#: plugins/admin/departments/country.tpl:44
+#: plugins/admin/departments/dcObject.tpl:44
+#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/organization.tpl:108
 msgid "Administrative settings"
 msgstr "管理设置"
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/domain.tpl:52
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:46
+#: plugins/admin/departments/generic.tpl:110
+#: plugins/admin/departments/domain.tpl:46
+#: plugins/admin/departments/country.tpl:46
+#: plugins/admin/departments/dcObject.tpl:46
+#: plugins/admin/departments/organization.tpl:110
 msgid "Tag department as an independent administrative unit"
 msgstr "将部门标记为独立的管理单元"
 
@@ -3937,7 +3884,7 @@ msgstr "部门描述文件"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
+#: plugins/admin/departments/class_department.inc:606
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "分类"
@@ -3947,75 +3894,75 @@ msgstr "分类"
 msgid "Category for this subtree"
 msgstr "这个子树的分类"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:67
 #: plugins/admin/departments/class_localityGeneric.inc:87
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/generic.tpl:387
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/organization.tpl:55
+#: plugins/admin/departments/organization.tpl:67
+#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/generic.tpl:382
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "位置"
 
-#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1638
-#: plugins/personal/generic/generic.tpl:395
+#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/departments/organization.tpl:59
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:390
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "州/省"
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/departments/organization.tpl:62
 msgid "State where this subtree is located"
 msgstr "这个子树位于的状态"
 
-#: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/organization.tpl:76
+#: plugins/admin/departments/generic.tpl:70
+#: plugins/admin/departments/organization.tpl:70
 msgid "Location of this subtree"
 msgstr "这个子树的位置"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:403
+#: plugins/admin/departments/generic.tpl:75
+#: plugins/admin/departments/class_department.inc:611
+#: plugins/admin/departments/organization.tpl:75
+#: plugins/personal/generic/generic.tpl:183
+#: plugins/personal/generic/generic.tpl:398
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
 msgstr "住址"
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:78
+#: plugins/admin/departments/organization.tpl:78
 msgid "Postal address of this subtree"
 msgstr "这个子树的地址"
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:85
+#: plugins/admin/departments/organization.tpl:85
 msgid "Base telephone number of this subtree"
 msgstr "这个子树的电话号码"
 
-#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/generic.tpl:90
 #: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1320
-#: plugins/personal/generic/class_user.inc:1733
-#: plugins/personal/generic/generic.tpl:369
-#: plugins/personal/generic/generic.tpl:537
+#: plugins/admin/departments/class_department.inc:312
+#: plugins/admin/departments/class_department.inc:613
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1732
+#: plugins/personal/generic/generic.tpl:364
+#: plugins/personal/generic/generic.tpl:532
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
 msgstr "传真"
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:93
+#: plugins/admin/departments/organization.tpl:93
 msgid "Base facsimile telephone number of this subtree"
 msgstr "这个子树的传真号码"
 
@@ -4029,8 +3976,8 @@ msgid "Domain Component"
 msgstr "域管理员"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
+#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_department.inc:601
 msgid "Departments"
 msgstr "部门"
 
@@ -4052,7 +3999,7 @@ msgid "Organization name"
 msgstr "组织/公司"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Postal address"
 msgstr "地址"
 
@@ -4081,45 +4028,45 @@ msgstr "要创建子树的名称"
 msgid "Name of country to create"
 msgstr "要创建子树的名称"
 
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_department.inc:372
 #, fuzzy
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr "致命错误：无法找到一个未使用的标志来标记管理单元！"
 
-#: plugins/admin/departments/class_department.inc:457
+#: plugins/admin/departments/class_department.inc:443
 #, php-format
 msgid "Tagging '%s'."
 msgstr "标记 '%s'。"
 
-#: plugins/admin/departments/class_department.inc:538
+#: plugins/admin/departments/class_department.inc:524
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s'"
 
-#: plugins/admin/departments/class_department.inc:579
+#: plugins/admin/departments/class_department.inc:565
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "拷贝 %s 失败，退出操作"
 
-#: plugins/admin/departments/class_department.inc:618
+#: plugins/admin/departments/class_department.inc:604
 msgid "Department name"
 msgstr "部门名称"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:612
 msgid "Telephone"
 msgstr "电话"
 
-#: plugins/admin/departments/class_department.inc:680
+#: plugins/admin/departments/class_department.inc:666
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "对象 '%s' 已经做标记"
 
-#: plugins/admin/departments/class_department.inc:687
+#: plugins/admin/departments/class_department.inc:673
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "添加标识（%s）到对象 '%s'"
 
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/departments/class_department.inc:705
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "从对象 '%s' 删除标记"
@@ -4182,7 +4129,7 @@ msgid "ACL Templates"
 msgstr "模板"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:726
 #, fuzzy
 msgid "Access control roles"
 msgstr "访问选项"
@@ -4192,54 +4139,54 @@ msgstr "访问选项"
 msgid "Edit AC roles"
 msgstr "MAC 地址"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Reset ACL"
 msgstr "删除"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:420
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "创建新 FAI 对象"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:426
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "编辑分类"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:430
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "分类"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy
 msgid "Object in use"
 msgstr "对象名称"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:646
 #, fuzzy, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:449
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "角色"
 
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:736
 #, fuzzy
 msgid "Permissions"
 msgstr "允许"
@@ -4274,274 +4221,274 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "应用程序设置"
 
-#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:279
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "female"
 msgstr "女"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:294
 msgid "male"
 msgstr "男"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:382
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:477
 #, fuzzy
 msgid "Serial number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:522
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr "（目前有的种类的证书不支持，可能显示为“无效”）"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:532
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "证书从 %s 到 %s 是有效的，当前为 %s。"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:535
 msgid "valid"
 msgstr "有效"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:536
 msgid "invalid"
 msgstr "无效"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:541
 msgid "No certificate installed"
 msgstr "未安装证书"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1143
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1150
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1168
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1239
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1644
-#: plugins/personal/generic/class_user.inc:1727
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1726
+#: plugins/personal/generic/generic.tpl:199
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:353
+#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1735
+#: plugins/personal/generic/generic.tpl:348
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1738
+#: plugins/personal/generic/generic.tpl:356
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "生日"
 
-#: plugins/personal/generic/class_user.inc:1441
+#: plugins/personal/generic/class_user.inc:1433
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "无法打开指定证书！"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:477
+#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/generic.tpl:472
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "单元"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:502
+#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/generic.tpl:497
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "家庭角色"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:419
+#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/generic.tpl:414
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "行业"
 
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:546
+#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/generic.tpl:541
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "最后传递"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:468
+#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/generic.tpl:463
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:427
+#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/generic.tpl:422
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "单元描述"
 
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:436
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/generic.tpl:431
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:445
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:440
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "单位职称"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:555
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:550
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:486
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:481
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "街道"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/generic/generic.tpl:494
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:489
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1595
 #, fuzzy
 msgid "Generic user settings"
 msgstr "通用队列设置"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1599
 #: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "我的账号"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1607
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1608
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1609
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "性别"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1613
 #, fuzzy
 msgid "Preferred language"
 msgstr "首选语种"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "用户图片"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1620
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:312
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Room number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1625
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1626
 #, fuzzy
 msgid "Pager number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: plugins/personal/generic/class_user.inc:1642
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:1643
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1637
 #, fuzzy
 msgid "User password method"
 msgstr "口令存储"
 
-#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "User certificates"
 msgstr "编辑证书"
@@ -4575,66 +4522,69 @@ msgstr "模板名称"
 msgid "Preferred langage"
 msgstr "首选语种"
 
-#: plugins/personal/generic/generic.tpl:169
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "将用户放到所选择子树中"
-
-#: plugins/personal/generic/generic.tpl:196
+#: plugins/personal/generic/generic.tpl:191
 #: plugins/personal/generic/multiple_generic.tpl:78
 msgid "Private phone"
 msgstr "私人电话"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:212
 #: plugins/personal/generic/multiple_generic.tpl:105
 msgid "Password storage"
 msgstr "口令存储"
 
-#: plugins/personal/generic/generic.tpl:234
+#: plugins/personal/generic/generic.tpl:229
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "证书"
 
-#: plugins/personal/generic/generic.tpl:237
+#: plugins/personal/generic/generic.tpl:232
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "编辑证书"
 
-#: plugins/personal/generic/generic.tpl:250
+#: plugins/personal/generic/generic.tpl:245
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:249
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:268
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/generic.tpl:301
+#: plugins/personal/generic/generic.tpl:296
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:304
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/generic.tpl:335
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:330
+#: plugins/personal/generic/generic.tpl:512
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/generic.tpl:526
 msgid "Please use the phone tab"
 msgstr "请使用电话页面"
 
+#: plugins/personal/generic/multiple_generic.tpl:53
+msgid "Choose subtree to place user in"
+msgstr "将用户放到所选择子树中"
+
+#: plugins/personal/generic/multiple_generic.tpl:56
+msgid "Select a base"
+msgstr "选择一个位置"
+
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "用户设置"
@@ -5256,6 +5206,10 @@ msgstr "用户管理"
 msgid "Migrate"
 msgstr "创建"
 
+#: setup/setup_migrate.tpl:60 setup/setup_migrate.tpl:107
+msgid "Close"
+msgstr "关闭"
+
 #: setup/setup_migrate.tpl:65
 msgid "Move windows workstations into a valid windows workstation department"
 msgstr ""
@@ -6756,6 +6710,16 @@ msgstr ""
 msgid "Automatic"
 msgstr "自动"
 
+#, fuzzy
+#~ msgid "Choose a base"
+#~ msgstr "选择一个位置"
+
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "选择来放置组的子树"
+
+#~ msgid "Choose subtree to place department in"
+#~ msgstr "选择放置部门的子树"
+
 #, fuzzy
 #~ msgid "Show %s"
 #~ msgstr "显示组"