updated templates

[gosa.git] / gosa-core / locale / core / messages.po

diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index 9e4a156f8de88fc89e2e3ebc4ea590763ae554cc..e4a2e951c90fea6df74cb12977d4d98cb87d00a0 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: 2009-09-01 08:22+0200\n"
+"POT-Creation-Date: 2010-03-11 17:20+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,44 +16,162 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ihtml/themes/default/MultiSelectWindow.tpl:51
-#: ihtml/themes/default/MultiSelectWindow.tpl:92
-#: ihtml/themes/default/msg_dialog.tpl:61
-#: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
-msgid "Information"
+#: ihtml/themes/modern/userFilter.tpl:1
+msgid "List of defined filters"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:1
+#: ihtml/themes/modern/userFilterEditor.tpl:5
+msgid "Filter editor"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:8
+msgid "Filter properties"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:11 include/class_userFilter.inc:62
+#: include/class_userFilter.inc:148 include/class_userFilterEditor.inc:142
+#: include/class_userFilterEditor.inc:146
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:768
+#: plugins/admin/ogroups/class_ogroup.inc:783
+#: plugins/admin/ogroups/class_ogroup.inc:787
+#: plugins/admin/ogroups/class_ogroup.inc:975
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/groups/class_group.inc:1045
+#: plugins/admin/groups/class_group.inc:1056
+#: plugins/admin/groups/class_group.inc:1058
+#: plugins/admin/groups/class_group.inc:1075
+#: plugins/admin/groups/class_group.inc:1089
+#: plugins/admin/groups/class_group.inc:1096
+#: plugins/admin/groups/class_group.inc:1183
+#: plugins/admin/users/class_userManagement.inc:423
+#: plugins/admin/users/class_userManagement.inc:470
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:90
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:90
+#: plugins/admin/departments/class_department.inc:349
+#: plugins/admin/departments/class_department.inc:351
+#: plugins/admin/departments/class_department.inc:356
+#: plugins/admin/departments/class_department.inc:363
+#: plugins/admin/departments/class_department.inc:367
+#: 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:1333
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1835
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:34
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
+msgid "Name"
 msgstr ""
 
-#: ihtml/themes/default/MultiSelectWindow.tpl:63
-#: ihtml/themes/default/MultiSelectWindow.tpl:103
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:21
-msgid "Filters"
+#: ihtml/themes/modern/userFilterEditor.tpl:19
+#: include/class_SnapShotDialog.inc:171 include/class_userFilter.inc:62
+#: include/class_userFilterEditor.inc:151
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:977
+#: 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:1184
+#: 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:63
+#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:92
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:123
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:92
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:91
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:359
+#: plugins/admin/departments/class_department.inc:663
+#: 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:41
+msgid "Description"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:27 include/class_userFilter.inc:62
+msgid "Parent filter"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:40
+#: plugins/personal/generic/class_user.inc:1663
+#: plugins/personal/generic/generic.tpl:610
+msgid "Public visible"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:45 setup/setup_config3.tpl:330
+#: setup/setup_config3.tpl:333
+msgid "Enabled"
+msgstr ""
+
+#: ihtml/themes/modern/userFilterEditor.tpl:49
+msgid "Categories where the filter is visible"
 msgstr ""
 
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:416 html/index.php:422
-#: include/functions.inc:747 include/functions.inc:2173
-#: include/functions.inc:2177 include/functions.inc:2183
-#: include/class_tabs.inc:266 include/utils/class_xml.inc:37
+#: html/index.php:63 html/index.php:414 html/index.php:420
+#: include/functions.inc:931 include/functions.inc:2644
+#: include/functions.inc:2648 include/functions.inc:2654
+#: include/class_tabs.inc:241 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/groups/class_groupGeneric.inc:1091
-#: plugins/admin/users/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/groups/class_group.inc:994 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:863
-#: plugins/personal/posix/class_posixAccount.inc:1016
+#: plugins/personal/posix/class_posixAccount.inc:779
+#: plugins/personal/posix/class_posixAccount.inc:932
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
 #: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
-#: setup/class_setupStep_Migrate.inc:2565
-#: setup/class_setupStep_Migrate.inc:2718
-#: setup/class_setupStep_Migrate.inc:3050 setup/setup_checks.tpl:32
+#: setup/class_setupStep_Migrate.inc:2572
+#: setup/class_setupStep_Migrate.inc:2725
+#: setup/class_setupStep_Migrate.inc:3057 setup/setup_checks.tpl:32
 #: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr ""
@@ -66,6 +184,7 @@ msgstr ""
 
 #: ihtml/themes/default/remove.tpl:9 plugins/admin/ogroups/remove.tpl:10
 #: plugins/admin/groups/remove.tpl:10 plugins/admin/users/remove.tpl:10
+#: plugins/admin/acl/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
@@ -75,15 +194,14 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/msg_dialog.tpl:79
-#: ihtml/themes/default/msg_dialog.tpl:136
 #: ihtml/themes/default/msg_dialog.tpl:139
-#: ihtml/themes/default/islocked.tpl:19 include/class_baseSelectDialog.inc:62
-#: include/utils/class_msgPool.inc:308 setup/setup_migrate.tpl:163
-#: setup/setup_migrate.tpl:214 setup/setup_migrate.tpl:261
-#: setup/setup_migrate.tpl:326 setup/setup_migrate.tpl:382
-#: setup/setup_migrate.tpl:435 setup/setup_migrate.tpl:480
-#: setup/setup_migrate.tpl:523 setup/setup_migrate.tpl:567
-#: setup/setup_ldap.tpl:17
+#: ihtml/themes/default/msg_dialog.tpl:144
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:312
+#: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
+#: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
+#: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
+#: setup/setup_migrate.tpl:480 setup/setup_migrate.tpl:523
+#: setup/setup_migrate.tpl:567 setup/setup_ldap.tpl:17
 #, php-format
 msgid "Cancel"
 msgstr ""
@@ -104,15 +222,14 @@ msgstr ""
 
 #: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:44
 #: ihtml/themes/default/password.tpl:69 ihtml/themes/default/password.tpl:71
-#: plugins/admin/users/class_divListUsers.inc:80
 msgid "Username"
 msgstr ""
 
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:40
-#: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/generic/paste_generic.tpl:21
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr ""
 
@@ -151,7 +268,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:330
 #, php-format
 msgid "Save"
 msgstr ""
@@ -191,8 +308,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
-#: plugins/personal/generic/generic.tpl:137
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set"
 msgstr ""
@@ -201,22 +317,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:324 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
@@ -242,7 +358,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1090
 msgid "Members"
 msgstr ""
 
@@ -250,7 +366,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 ""
 
@@ -275,10 +391,10 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:274
-#: plugins/personal/generic/main.inc:97
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
+#: plugins/personal/myaccount/main.inc:97
 msgid "New password"
 msgstr ""
 
@@ -288,9 +404,7 @@ msgid "Verify password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: plugins/admin/users/class_divListUsers.inc:136
-#: plugins/admin/users/class_divListUsers.inc:270
-#: plugins/admin/users/user-list.xml:107 plugins/admin/users/user-list.xml:193
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr ""
 
@@ -333,10 +447,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_departmentGeneric.inc:574
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
+#: include/class_acl.inc:784 include/class_acl.inc:791
+#: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
+#: plugins/admin/departments/class_department.inc:618
 msgid "Object"
 msgstr ""
 
@@ -374,64 +488,83 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
-#: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/users/template.tpl:49
+#: plugins/admin/departments/class_department.inc:558
+#: plugins/admin/departments/class_department.inc:640
 msgid "Continue"
 msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:57
-#: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:223
-#: html/index.php:227 include/password-methods/class_password-methods.inc:250
-#: include/class_tabs.inc:54 include/class_plugin.inc:661
-#: include/class_plugin.inc:702 include/class_plugin.inc:744
-#: include/class_plugin.inc:1565 include/utils/class_xml.inc:40
-#: include/utils/class_msgPool.inc:153 include/utils/class_msgPool.inc:165
-#: include/utils/class_msgPool.inc:183 include/utils/class_msgPool.inc:453
-#: include/utils/class_msgPool.inc:474 include/utils/class_msgPool.inc:493
-#: include/class_log.inc:138 include/class_log.inc:219
-#: include/class_gosaSupportDaemon.inc:1165
-#: include/class_gosaSupportDaemon.inc:1185
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:126
-#: include/class_CopyPasteHandler.inc:158
-#: include/class_CopyPasteHandler.inc:175
-#: include/class_CopyPasteHandler.inc:184
-#: include/class_CopyPasteHandler.inc:192
-#: include/class_CopyPasteHandler.inc:268
-#: include/class_CopyPasteHandler.inc:367 include/class_msg_dialog.inc:99
-#: plugins/admin/groups/class_groupGeneric.inc:627
-#: plugins/admin/groups/class_groupGeneric.inc:633
-#: plugins/admin/groups/class_groupGeneric.inc:981
-#: plugins/admin/groups/class_groupGeneric.inc:986
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/personal/generic/class_user.inc:414
-#: plugins/personal/generic/class_user.inc:515
-#: plugins/personal/generic/class_user.inc:821
-#: plugins/personal/generic/class_user.inc:1398
-#: plugins/personal/generic/main.inc:115
-#: plugins/personal/posix/class_posixAccount.inc:1413
-#: setup/class_setupStep_Migrate.inc:1197 setup/setup_checks.tpl:30
+#: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
+#: html/index.php:228 include/class_management.inc:448
+#: include/class_management.inc:584 include/class_management.inc:916
+#: include/password-methods/class_password-methods.inc:250
+#: include/class_listing.inc:485 include/functions.inc:3351
+#: include/functions.inc:3365 include/functions.inc:3395
+#: include/functions.inc:3403 include/functions.inc:3415
+#: include/functions.inc:3419 include/functions.inc:3434
+#: include/functions.inc:3443 include/functions.inc:3503
+#: include/class_tabs.inc:56 include/class_plugin.inc:1486
+#: include/class_plugin.inc:2078 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:457
+#: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:127
+#: include/class_CopyPasteHandler.inc:159
+#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:185
+#: include/class_CopyPasteHandler.inc:193
+#: include/class_CopyPasteHandler.inc:273
+#: include/class_CopyPasteHandler.inc:375 include/class_msg_dialog.inc:99
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: 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:1221
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/acl/class_aclRole.inc:681
+#: plugins/personal/generic/class_user.inc:297
+#: plugins/personal/generic/class_user.inc:429
+#: plugins/personal/generic/class_user.inc:522
+#: plugins/personal/generic/class_user.inc:816
+#: plugins/personal/generic/class_user.inc:1205
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1500
+#: plugins/personal/generic/class_user.inc:1784
+#: plugins/personal/myaccount/main.inc:112
+#: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
 msgid "Error"
 msgstr ""
 
+#: ihtml/themes/default/msg_dialog.tpl:61
+#: ihtml/themes/default/msg_dialog.tpl:108
+#: plugins/admin/ogroups/class_ogroup.inc:218 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:133
-#: ihtml/themes/default/msg_dialog.tpl:135
-#: ihtml/themes/default/msg_dialog.tpl:138 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:134
+#: ihtml/themes/default/msg_dialog.tpl:137
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:318
 #: 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
 #: setup/class_setupStep_Migrate.inc:658 setup/class_setupStep_Migrate.inc:799
 #: setup/class_setupStep_Migrate.inc:1045
-#: setup/class_setupStep_Migrate.inc:2007
-#: setup/class_setupStep_Migrate.inc:2149
-#: setup/class_setupStep_Migrate.inc:2571
-#: setup/class_setupStep_Migrate.inc:2725
-#: setup/class_setupStep_Migrate.inc:3055 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:2012
+#: setup/class_setupStep_Migrate.inc:2156
+#: setup/class_setupStep_Migrate.inc:2578
+#: setup/class_setupStep_Migrate.inc:2732
+#: setup/class_setupStep_Migrate.inc:3062 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87
 #, php-format
 msgid "Ok"
@@ -449,9 +582,8 @@ msgstr ""
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:338
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: ihtml/themes/default/password.tpl:41 html/main.php:340
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -511,7 +643,8 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:21 setup/setup_ldap.tpl:13
+#: ihtml/themes/default/help.tpl:21 include/class_filter.inc:226
+#: setup/setup_ldap.tpl:13
 msgid "Search"
 msgstr ""
 
@@ -554,7 +687,7 @@ 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:203
+#: include/class_pluglist.inc:229
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -580,44 +713,44 @@ msgstr ""
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:149 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:433
 msgid "Fatal error"
 msgstr ""
 
-#: html/password.php:58 html/index.php:143
+#: html/password.php:58 html/index.php:144
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/password.php:74 html/index.php:143 html/index.php:215
-#: html/main.php:228
+#: html/password.php:74 html/index.php:144 html/index.php:216
+#: html/main.php:230
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
-#: include/class_SnapshotHandler.inc:76 include/functions.inc:639
-#: include/functions.inc:2536 include/functions.inc:2560
-#: include/functions.inc:2573 include/utils/class_timezone.inc:47
-#: include/class_config.inc:124 include/class_config.inc:636
-#: include/class_config.inc:1021 include/class_config.inc:1034
-#: include/class_config.inc:1052 include/class_pluglist.inc:177
-#: include/class_CopyPasteHandler.inc:118
-#: include/class_CopyPasteHandler.inc:127
-#: include/class_CopyPasteHandler.inc:176
-#: include/class_CopyPasteHandler.inc:185
-#: include/class_CopyPasteHandler.inc:193
-#: plugins/admin/groups/class_groupGeneric.inc:163
-#: plugins/admin/groups/class_groupGeneric.inc:755
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:802
+#: include/functions.inc:3025 include/functions.inc:3057
+#: include/functions.inc:3070 include/utils/class_timezone.inc:47
+#: include/class_config.inc:155 include/class_config.inc:702
+#: include/class_config.inc:1153 include/class_config.inc:1166
+#: include/class_config.inc:1184 include/class_pluglist.inc:98
+#: include/class_CopyPasteHandler.inc:119
+#: include/class_CopyPasteHandler.inc:128
+#: include/class_CopyPasteHandler.inc:177
+#: include/class_CopyPasteHandler.inc:186
+#: include/class_CopyPasteHandler.inc:194
+#: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:667
 msgid "Configuration error"
 msgstr ""
 
-#: html/password.php:74 html/index.php:164 html/setup.php:66
+#: html/password.php:74 html/index.php:165 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:605
+#: html/password.php:159 plugins/personal/generic/class_user.inc:614
 msgid "Password method"
 msgstr ""
 
@@ -625,9 +758,9 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
-#: plugins/personal/generic/main.inc:92
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/password/class_password.inc:82
+#: plugins/personal/myaccount/main.inc:94
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -641,17 +774,20 @@ msgstr ""
 msgid "The password used as new is to short."
 msgstr ""
 
-#: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1254
-#: plugins/personal/generic/class_user.inc:1268
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/generic.tpl:82
-#: plugins/personal/generic/paste_generic.tpl:15
+#: html/password.php:215 plugins/admin/groups/userSelect/user-list.xml:56
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
+#: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
+#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1346
+#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/generic.tpl:68
+#: plugins/personal/generic/paste_generic.tpl:16
 msgid "Login"
 msgstr ""
 
-#: html/password.php:224 html/index.php:324
+#: html/password.php:224 html/index.php:321
 msgid "Please check the username/password combination."
 msgstr ""
 
@@ -663,11 +799,11 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/password.php:280 html/index.php:416
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:280 html/index.php:416
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr ""
 
@@ -681,94 +817,98 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:164
+#: html/index.php:165
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:216
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:223
+#: html/index.php:224
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:227
+#: html/index.php:228
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:253 html/index.php:268 html/index.php:281
-#: include/class_SnapshotHandler.inc:124 include/class_acl.inc:1219
-#: include/class_MultiSelectWindow.inc:550 include/functions.inc:365
-#: include/functions.inc:391 include/functions.inc:399
-#: include/functions.inc:428 include/functions.inc:654
-#: include/functions.inc:697 include/functions.inc:739
-#: include/functions.inc:784 include/functions.inc:2515
-#: include/functions.inc:2762 include/class_plugin.inc:1246
-#: include/class_plugin.inc:1295 include/class_plugin.inc:1299
-#: include/class_plugin.inc:1314 include/class_plugin.inc:1351
-#: include/class_plugin.inc:1409 include/class_plugin.inc:1475
-#: include/class_plugin.inc:1490 include/class_ldap.inc:709
-#: include/class_ldap.inc:1175 include/class_config.inc:266
-#: plugins/admin/ogroups/class_ogroup.inc:1033
-#: plugins/admin/ogroups/class_ogroup.inc:1047
-#: plugins/admin/groups/class_groupGeneric.inc:785
-#: plugins/admin/groups/class_groupGeneric.inc:1115
-#: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:429
-#: plugins/admin/departments/class_departmentGeneric.inc:702
-#: plugins/admin/departments/class_departmentGeneric.inc:733
-#: plugins/admin/acl/class_aclRole.inc:633
-#: plugins/admin/acl/class_aclRole.inc:673
-#: plugins/admin/acl/class_aclRole.inc:687
-#: plugins/personal/generic/class_user.inc:724
-#: plugins/personal/generic/class_user.inc:1100
-#: plugins/personal/posix/class_posixAccount.inc:704
-#: plugins/personal/posix/class_posixAccount.inc:1033
-#: setup/class_setupStep_Migrate.inc:1208
-#: setup/class_setupStep_Migrate.inc:1236
-#: setup/class_setupStep_Migrate.inc:1285
-#: setup/class_setupStep_Migrate.inc:1334
-#: setup/class_setupStep_Migrate.inc:2137
-#: setup/class_setupStep_Migrate.inc:2432
-#: setup/class_setupStep_Migrate.inc:2436
-#: setup/class_setupStep_Migrate.inc:2626
-#: setup/class_setupStep_Migrate.inc:2646
-#: setup/class_setupStep_Migrate.inc:2763
-#: setup/class_setupStep_Migrate.inc:3110
-#: setup/class_setupStep_Migrate.inc:3124
+#: html/index.php:254 html/index.php:265 html/index.php:278
+#: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
+#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
+#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
+#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
+#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_acl.inc:1329 include/functions.inc:476
+#: include/functions.inc:511 include/functions.inc:519
+#: include/functions.inc:565 include/functions.inc:817
+#: include/functions.inc:866 include/functions.inc:923
+#: include/functions.inc:976 include/functions.inc:3004
+#: include/functions.inc:3277 include/class_userFilter.inc:269
+#: include/class_plugin.inc:1163 include/class_plugin.inc:1212
+#: include/class_plugin.inc:1216 include/class_plugin.inc:1232
+#: include/class_plugin.inc:1272 include/class_plugin.inc:1330
+#: include/class_plugin.inc:1396 include/class_plugin.inc:1411
+#: include/class_ldap.inc:753 include/class_ldap.inc:1219
+#: include/class_config.inc:325 plugins/admin/ogroups/class_ogroup.inc:888
+#: plugins/admin/ogroups/class_ogroup.inc:902
+#: plugins/admin/groups/class_group.inc:697
+#: plugins/admin/groups/class_group.inc:1018
+#: plugins/admin/departments/class_department.inc:279
+#: plugins/admin/departments/class_department.inc:476
+#: plugins/admin/departments/class_department.inc:747
+#: plugins/admin/departments/class_department.inc:778
+#: 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:730
+#: plugins/personal/generic/class_user.inc:1127
+#: plugins/personal/posix/class_posixAccount.inc:617
+#: plugins/personal/posix/class_posixAccount.inc:949
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1239
+#: setup/class_setupStep_Migrate.inc:1288
+#: setup/class_setupStep_Migrate.inc:1337
+#: setup/class_setupStep_Migrate.inc:2142
+#: setup/class_setupStep_Migrate.inc:2439
+#: setup/class_setupStep_Migrate.inc:2443
+#: setup/class_setupStep_Migrate.inc:2633
+#: setup/class_setupStep_Migrate.inc:2653
+#: setup/class_setupStep_Migrate.inc:2770
+#: setup/class_setupStep_Migrate.inc:3117
+#: setup/class_setupStep_Migrate.inc:3131
 msgid "LDAP error"
 msgstr ""
 
-#: html/index.php:268
+#: html/index.php:265
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:281
+#: html/index.php:278
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:302
+#: html/index.php:299
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:302
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:317
+#: html/index.php:314
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:371
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:422
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -778,47 +918,52 @@ msgstr ""
 msgid "Smarty"
 msgstr ""
 
-#: html/main.php:148
+#: html/main.php:150
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:167
+#: html/main.php:169
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:168
+#: html/main.php:170
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:228
+#: html/main.php:230
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:284
-msgid "User ACL checks disabled"
+#: html/main.php:288
+msgid "ACLs are disabled"
 msgstr ""
 
-#: html/main.php:338
+#: html/main.php:288 html/main.php:290
+#, php-format
+msgid "You're logged in as %s"
+msgstr ""
+
+#: html/main.php:340
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:348
+#: html/main.php:350
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:349
+#: html/main.php:351
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:363
+#: html/main.php:366
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:364
+#: html/main.php:367
 #, php-format
 msgid ""
 "FATAL: not all POST variables have been transfered by PHP - please inform "
@@ -846,6 +991,47 @@ msgstr ""
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr ""
+
+#: include/class_management.inc:290 include/class_management.inc:427
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1434
+#: include/class_plugin.inc:1446 include/class_plugin.inc:1461
+#: include/class_plugin.inc:1474
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:629
+msgid "Permission"
+msgstr ""
+
+#: include/class_management.inc:351
+#: plugins/admin/users/class_userManagement.inc:587
+#: plugins/admin/users/class_userManagement.inc:591
+#: plugins/admin/acl/class_aclManagement.inc:98
+msgid "Permission error"
+msgstr ""
+
+#: include/class_management.inc:427 include/class_plugin.inc:1434
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1446
+#: include/class_plugin.inc:1461 include/class_plugin.inc:1474
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
+#: include/class_management.inc:584
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -860,273 +1046,228 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
+#: include/class_pathNavigator.inc:66
+msgid "Welcome to GOsa"
+msgstr ""
+
 #: include/password-methods/class_password-methods.inc:250
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1154 include/class_config.inc:1185
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1167
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "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:27
+#: 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:124
+#: include/class_acl.inc:120 include/class_acl.inc:581
+#: include/class_acl.inc:1009
+#, php-format
+msgid "All users"
+msgstr ""
+
+#: include/class_acl.inc:214 plugins/admin/acl/class_aclRole.inc:127
 msgid "All categories"
 msgstr ""
 
-#: include/class_acl.inc:220
+#: include/class_acl.inc:222
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:223 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:133
+#: include/class_acl.inc:224 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:136
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:137
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:226 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:227 include/class_acl.inc:230
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/users/user-list.xml:15
-#: plugins/personal/generic/class_user.inc:1565
+#: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1675
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1304
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:233 plugins/admin/groups/class_group.inc:1180
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr ""
 
-#: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:234
-#: include/class_listing.inc:897 include/class_listing.inc:899
-#: plugins/admin/acl/class_aclRole.inc:392
+#: include/class_acl.inc:496 include/class_listing.inc:247
+#: include/class_sortableListing.inc:229
+#: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:498 include/class_listing.inc:247
+#: include/class_sortableListing.inc:229
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr ""
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:134
-#: plugins/admin/users/user-list.xml:100
-#: plugins/admin/acl/class_aclRole.inc:397
-#: plugins/admin/acl/class_aclRole.inc:446
+#: include/class_acl.inc:503 include/class_acl.inc:551
+#: 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:500 include/class_acl.inc:504
-#: include/class_acl.inc:1251 include/class_acl.inc:1252
-#: include/class_acl.inc:1257 include/class_tabs.inc:399
-#: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:293
-#: plugins/admin/acl/class_divListACL.inc:179
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:398
-#: plugins/admin/acl/class_aclRole.inc:402
-#: plugins/admin/acl/class_aclRole.inc:766
+#: include/class_acl.inc:503 include/class_acl.inc:507
+#: include/class_acl.inc:1265 include/class_acl.inc:1266
+#: include/class_acl.inc:1271 include/class_tabs.inc:374
+#: 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/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: include/class_acl.inc:507 include/class_acl.inc:555
+#: include/utils/class_msgPool.inc:342 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:543
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:542
+#: include/class_acl.inc:545
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:548 include/class_acl.inc:552
+#: include/class_acl.inc:551 include/class_acl.inc:555
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:602
+#: include/class_acl.inc:608
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:618 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:779 include/class_acl.inc:786
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:797
+#: include/class_acl.inc:803
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:804
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:805
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:801
+#: include/class_acl.inc:807
 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:811 include/class_acl.inc:916
+#: include/class_acl.inc:920
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:806 include/class_acl.inc:912
-#: include/class_acl.inc:915
+#: include/class_acl.inc:812 include/class_acl.inc:918
+#: include/class_acl.inc:921
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:810
+#: include/class_acl.inc:816
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:954 include/class_session.inc:76
+#: include/class_acl.inc:960 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:468 include/functions.inc:629
-#: include/functions.inc:726 include/functions.inc:1109
-#: include/functions.inc:1931 include/functions.inc:1965
-#: include/functions.inc:1985 include/class_ldap.inc:649
-#: include/class_ldap.inc:697 include/class_log.inc:88
-#: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269
+#: include/functions.inc:605 include/functions.inc:792
+#: include/functions.inc:910 include/functions.inc:1308
+#: include/functions.inc:2372 include/functions.inc:2406
+#: include/functions.inc:2426 include/class_ldap.inc:693
+#: include/class_ldap.inc:741 include/class_log.inc:87
+#: include/class_CopyPasteHandler.inc:160
+#: include/class_CopyPasteHandler.inc:274
 msgid "Internal error"
 msgstr ""
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:960
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:997
+#: include/class_acl.inc:1005
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1057 include/class_acl.inc:1059
+#: include/class_acl.inc:1069 include/class_acl.inc:1071
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1059
+#: include/class_acl.inc:1071
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1067
+#: include/class_acl.inc:1079
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1082
-msgid "ACL takes effect for all users"
-msgstr ""
-
-#: include/class_acl.inc:1252
-msgid "Access control list"
-msgstr ""
-
-#: include/class_acl.inc:1257
-msgid "ACL roles"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:145 setup/setup_migrate.tpl:60
-#: setup/setup_migrate.tpl:107
-msgid "Close"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:889
-msgid "Go to root department"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:889
-#: include/class_listing.inc:891
-msgid "Root"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:897
-msgid "Go up one department"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:905
-msgid "Go to users department"
-msgstr ""
-
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:905
-#: include/class_listing.inc:907
-msgid "Home"
+#: include/class_acl.inc:1096
+msgid "inactive"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:912
-msgid "Reload list"
+#: include/class_acl.inc:1096
+msgid "No members"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:912
-#: plugins/admin/ogroups/class_divListOGroup.inc:148
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/class_divListDepartment.inc:87
-#: plugins/admin/acl/class_divListACL.inc:104
-msgid "Submit"
+#: include/class_acl.inc:1266
+msgid "Access control list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:550
-#, php-format
-msgid "Inconsistent DN encoding detected: '%s'"
+#: include/class_acl.inc:1271
+msgid "ACL roles"
 msgstr ""
 
 #: include/class_session.inc:76 include/class_session.inc:101
@@ -1134,399 +1275,386 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:44
-msgid "Choose a base"
+#: include/class_listing.inc:306 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_baseSelectDialog.inc:55
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
+#: include/class_listing.inc:527
+msgid "created by"
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
+#: include/class_listing.inc:999 include/class_listing.inc:1001
+#: include/class_baseSelector.inc:159
+msgid "Root"
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1130
-#: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/groups/class_groupGeneric.inc:1309
-#: plugins/admin/users/class_divListUsers.inc:113
-#: plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/class_departmentGeneric.inc:621
-#: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/generic.tpl:39
-#: plugins/admin/departments/class_divListDepartment.inc:85
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/class_divListACL.inc:102
-#: plugins/admin/acl/class_aclRole.inc:751 plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
+#: include/class_listing.inc:1006 include/class_listing.inc:1008
+msgid "Go up one department"
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
+#: include/class_listing.inc:1014 include/class_listing.inc:1016
+msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:281
-#: plugins/admin/ogroups/class_divListOGroup.inc:77
-#: plugins/admin/groups/class_divListGroup.inc:73
-#: plugins/admin/users/class_divListUsers.inc:74
-#: plugins/admin/departments/class_divListDepartment.inc:59
-#: plugins/admin/acl/class_divListACL.inc:67 setup/setup_migrate.tpl:93
-#: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
-#: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
-#: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
-#: setup/setup_migrate.tpl:551
-msgid "Select all"
+#: include/class_listing.inc:1021
+msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:469
-msgid "created by"
+#: include/class_listing.inc:1116 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
+#: 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:1237 include/class_listing.inc:1287
-#: include/class_plugin.inc:2037
+#: include/class_listing.inc:1386 include/class_plugin.inc:1958
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1243 include/class_listing.inc:1277
-#: include/class_plugin.inc:2041
+#: include/class_listing.inc:1392 include/class_plugin.inc:1962
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1251 include/class_listing.inc:1253
-#: include/class_plugin.inc:2048 include/class_plugin.inc:2051
-#: include/class_CopyPasteHandler.inc:506
+#: include/class_listing.inc:1400 include/class_listing.inc:1402
+#: include/class_plugin.inc:1969 include/class_plugin.inc:1972
+#: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1277 include/class_plugin.inc:1995
+#: include/class_listing.inc:1425 include/class_plugin.inc:1916
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1287 include/class_plugin.inc:2003
+#: include/class_listing.inc:1434 include/class_plugin.inc:1924
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1319 include/class_listing.inc:1321
+#: include/class_listing.inc:1466 include/class_listing.inc:1468
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1335
+#: include/class_listing.inc:1482
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1370 include/class_listing.inc:1371
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1969
+#: include/class_listing.inc:1516 include/class_SnapShotDialog.inc:135
+#: include/class_plugin.inc:1890
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1380 include/class_plugin.inc:1976
-msgid "Create snapshot"
+#: include/class_listing.inc:1524 include/class_plugin.inc:1898
+msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_listing.inc:1381 include/class_plugin.inc:1977
-msgid "Create a new snapshot from this object"
+#: include/class_sortableListing.inc:189
+msgid "Sortable list"
+msgstr ""
+
+#: include/class_sortableListing.inc:194
+msgid "Edit this entry"
 msgstr ""
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:199
+msgid "Delete this entry"
+msgstr ""
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:448
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:399
+#: include/functions.inc:519
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:468
+#: include/functions.inc:605
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:629 include/functions.inc:726
+#: include/functions.inc:792 include/functions.inc:910
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:639
+#: include/functions.inc:802
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:639
+#: include/functions.inc:802
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:747
+#: include/functions.inc:931
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1037
+#: include/functions.inc:1235
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1039
+#: include/functions.inc:1237
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1051 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1249 plugins/personal/generic/generic.tpl:222
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1056
+#: include/functions.inc:1254
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1349
+#: include/functions.inc:1644
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1351
+#: include/functions.inc:1646
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1353
+#: include/functions.inc:1648
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1537
+#: include/functions.inc:1888
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1565 include/class_filter.inc:309
+#: include/functions.inc:1917
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1808 include/class_filter.inc:275
+#: include/functions.inc:2229
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1852
+#: include/functions.inc:2275
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1931
+#: include/functions.inc:2372
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1965 include/functions.inc:1985
+#: include/functions.inc:2406 include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2173 include/functions.inc:2177
-#: include/functions.inc:2183
+#: include/functions.inc:2644 include/functions.inc:2648
+#: include/functions.inc:2654
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2205
+#: include/functions.inc:2678
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2205
+#: include/functions.inc:2678
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2231
+#: include/functions.inc:2704
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2238
+#: include/functions.inc:2711
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2281
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2283
+#: include/functions.inc:2759
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2289
+#: include/functions.inc:2764
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2291
-#, php-format
-msgid "Version mismatch for optional object class '%s' (!=%s)!"
-msgstr ""
-
-#: include/functions.inc:2295
+#: include/functions.inc:2767
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2317
+#: include/functions.inc:2789
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2318
+#: include/functions.inc:2790
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2322
+#: include/functions.inc:2794
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2323
+#: include/functions.inc:2795
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2347
+#: include/functions.inc:2819
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2348
+#: include/functions.inc:2820
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2821
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2350
+#: include/functions.inc:2822
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2351
+#: include/functions.inc:2823
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2352
+#: include/functions.inc:2824
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2353
+#: include/functions.inc:2825
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2355
+#: include/functions.inc:2827
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2356
+#: include/functions.inc:2828
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2829
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2535
+#: include/functions.inc:3024
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2560
+#: include/functions.inc:3057
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2573
+#: include/functions.inc:3070
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/class_tabs.inc:55
+#: include/functions.inc:3351 include/functions.inc:3365
+#: include/functions.inc:3403 include/functions.inc:3415
+#: include/functions.inc:3419 include/functions.inc:3434
+#: include/functions.inc:3443
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: include/functions.inc:3351
+msgid "unknown idAllocation method!"
+msgstr ""
+
+#: include/functions.inc:3365
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: include/functions.inc:3395
+msgid "Cannot create sambaUnixIdPool entry!"
+msgstr ""
+
+#: include/functions.inc:3403
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: include/functions.inc:3415 include/functions.inc:3419
+msgid "no ID available!"
+msgstr ""
+
+#: include/functions.inc:3443
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: include/functions.inc:3503
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:241
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:379
 msgid "References"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/class_ogroup.inc:1131
-#: plugins/admin/ogroups/generic.tpl:15 plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:1308
-#: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:619
-#: plugins/admin/departments/locality.tpl:19
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_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/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:752 plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr ""
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1535,7 +1663,11 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: include/exporter/class_pdfExporter.inc:142
+#: include/exporter/class_pdfExporter.inc:18
+msgid "No PDF export possible: there is no FPDF library installed."
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:145
 msgid "PDF"
 msgstr ""
 
@@ -1567,118 +1699,121 @@ msgstr ""
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/php_setup.inc:100
+#: include/php_setup.inc:103
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:105
+#: include/php_setup.inc:108
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:105
+#: include/php_setup.inc:108
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:110
+#: include/php_setup.inc:113
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:120
+#: include/php_setup.inc:123
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:139
+#: include/php_setup.inc:142
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:148
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:150
+#: include/php_setup.inc:153
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:154
+#: include/php_setup.inc:157
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:187
+#: include/php_setup.inc:190
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:188
+#: include/php_setup.inc:191
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:188
+#: include/php_setup.inc:191
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:188
+#: include/php_setup.inc:191
 msgid "Type"
 msgstr ""
 
-#: include/php_setup.inc:189
+#: include/php_setup.inc:192
 msgid "Arguments"
 msgstr ""
 
-#: include/class_filter.inc:316 include/utils/class_msgPool.inc:23
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-#: plugins/personal/posix/posix_groups.tpl:68
-msgid "Search in subtrees"
+#: include/class_userFilter.inc:62 plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_organizationGeneric.inc:124
+#: plugins/admin/departments/class_department.inc:664
+#: plugins/admin/departments/organization.tpl:27
+msgid "Category"
 msgstr ""
 
-#: include/class_plugin.inc:512
-msgid ""
-"The object has changed since opened in GOsa. All changes that may be done by "
-"others get lost if you save this entry!"
+#: include/class_userFilter.inc:62
+msgid "Options"
 msgstr ""
 
-#: include/class_plugin.inc:1513 include/class_plugin.inc:1525
-#: include/class_plugin.inc:1540 include/class_plugin.inc:1553
-#: plugins/admin/ogroups/class_ogroupManagement.inc:237
-#: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:353
-#: plugins/admin/users/class_userManagement.inc:593
-#: plugins/admin/acl/class_aclManagement.inc:268
-msgid "Permission"
+#: include/class_filter.inc:451 include/utils/class_msgPool.inc:24
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Search in subtrees"
 msgstr ""
 
-#: include/class_plugin.inc:1513
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: include/class_filter.inc:456
+msgid "Edit filters"
 msgstr ""
 
-#: include/class_plugin.inc:1525 include/class_plugin.inc:1540
-#: include/class_plugin.inc:1553
+#: include/class_userFilterEditor.inc:159
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid ""
+"Please check your filter. You have '%s' opening and '%s' closing brackets!"
+msgstr ""
+
+#: include/class_plugin.inc:527
+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:1765
+#: include/class_plugin.inc:1688
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1765
+#: include/class_plugin.inc:1688
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1766 setup/class_setupStep_Migrate.inc:1246
-#: setup/class_setupStep_Migrate.inc:1296
-#: setup/class_setupStep_Migrate.inc:1344
+#: include/class_plugin.inc:1689 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:1951 include/class_plugin.inc:1953
+#: include/class_plugin.inc:1872 include/class_plugin.inc:1874
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:1995
+#: include/class_plugin.inc:1897
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_plugin.inc:1916
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2003
+#: include/class_plugin.inc:1924
 msgid "copy"
 msgstr ""
 
@@ -1720,710 +1855,702 @@ 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:295
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:295
+#: include/utils/class_msgPool.inc:299
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:302
+#: include/utils/class_msgPool.inc:306
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2861
+#: include/utils/class_msgPool.inc:336
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
+#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:276
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332
+#: include/utils/class_msgPool.inc:336
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:338
+#: include/utils/class_msgPool.inc:342
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:344
+#: include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:350
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:356
+#: include/utils/class_msgPool.inc:360
 msgid "Back"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:376
+#: include/utils/class_msgPool.inc:380
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:382
+#: include/utils/class_msgPool.inc:386
 #, 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:389 include/utils/class_msgPool.inc:396
 #, 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:405
 #, 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:408 include/utils/class_msgPool.inc:415
 #, 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:423
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:425
+#: include/utils/class_msgPool.inc:429
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:431
+#: include/utils/class_msgPool.inc:435
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "January"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "February"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "March"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:441
 msgid "April"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "May"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "June"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "July"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "August"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:442
 msgid "September"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "October"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "November"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:443
 msgid "December"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Sunday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Monday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:445
+#: include/utils/class_msgPool.inc:449
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:456
 msgid "MySQL operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:460
+#: include/utils/class_msgPool.inc:464
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:465
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:464
+#: include/utils/class_msgPool.inc:468
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:466
+#: include/utils/class_msgPool.inc:470
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:481
+#: include/utils/class_msgPool.inc:485
 msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:488
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:491
+#: include/utils/class_msgPool.inc:495
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:493
+#: include/utils/class_msgPool.inc:497
 #, 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:504 include/utils/class_msgPool.inc:507
 #, 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:510
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:512
 #, 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:518
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:524
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:530
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:536
 #, 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:542
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:548
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:550
+#: include/utils/class_msgPool.inc:554
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:556
+#: include/utils/class_msgPool.inc:560
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:562
+#: include/utils/class_msgPool.inc:566
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:568
+#: include/utils/class_msgPool.inc:572
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/utils/class_msgPool.inc:578
+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 ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:649
+#: include/class_ldap.inc:693
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:697
+#: include/class_ldap.inc:741
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:784
+#: include/class_ldap.inc:828
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:786
+#: include/class_ldap.inc:830
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1008
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1037
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr ""
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr ""
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: include/class_log.inc:165 include/class_log.inc:174
-#: include/class_log.inc:187 include/class_log.inc:204
-#: include/class_log.inc:242
-msgid "MySQL logging"
-msgstr ""
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr ""
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1165
+#: include/class_gosaSupportDaemon.inc:1184
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1185
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_config.inc:121
+#: include/class_config.inc:152
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:266
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:636
+#: include/class_config.inc:702
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1112
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1112
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
 msgstr ""
 
-#: include/class_pluglist.inc:58
+#: include/class_pluglist.inc:74
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:178
+#: include/class_pluglist.inc:99
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
-#: include/class_pluglist.inc:193 include/class_pluglist.inc:194
-#: include/class_pluglist.inc:307
+#: include/class_pluglist.inc:363
+#: plugins/admin/departments/class_department.inc:145
+#: plugins/personal/generic/class_user.inc:273
+#: plugins/personal/generic/class_user.inc:1873
 msgid "Unknown"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:126
-#: include/class_CopyPasteHandler.inc:158
-#: include/class_CopyPasteHandler.inc:175
-#: include/class_CopyPasteHandler.inc:184
-#: include/class_CopyPasteHandler.inc:192
-#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:127
+#: include/class_CopyPasteHandler.inc:159
+#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:185
+#: include/class_CopyPasteHandler.inc:193
+#: include/class_CopyPasteHandler.inc:273
 #, php-format
 msgid "Copy and paste failed!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr ""
 
@@ -2431,14 +2558,18 @@ msgstr ""
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
+#: include/class_baseSelector.inc:206
+msgid "Submit"
+msgstr ""
+
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_groupGeneric.inc:1298
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:966
+#: plugins/admin/groups/class_group.inc:1174
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/departments/class_department.inc:653
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1559
-#: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
+#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/posix/generic.tpl:5 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
 
@@ -2448,32 +2579,28 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:45
-#: plugins/admin/ogroups/class_divListOGroup.inc:204
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
-#: plugins/admin/groups/class_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: plugins/admin/groups/class_divListGroup.inc:192
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1078
-#: plugins/personal/posix/class_posixAccount.inc:303
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "FAX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr ""
 
@@ -2482,49 +2609,54 @@ msgid "FTP"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: plugins/admin/ogroups/class_ogroupManagement.inc:184
+#: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
+#: plugins/admin/groups/group-list.xml:15
+#: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:13
 msgid "Group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/users/class_divListUsers.inc:80
-#: plugins/admin/departments/class_departmentManagement.inc:604
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/multiple_generic.tpl:159
+#: 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:249
+#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/generic.tpl:310
 msgid "Department"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:536
-#: plugins/admin/groups/class_divListGroup.inc:196
-#: plugins/admin/users/class_divListUsers.inc:207
-#: plugins/admin/users/class_userManagement.inc:1094
-#: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/departments/generic.tpl:88
-#: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1687
-#: plugins/personal/generic/generic.tpl:338
-#: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/multiple_generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:428
+#: 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:783
+#: plugins/admin/departments/generic.tpl:106
+#: plugins/admin/departments/class_department.inc:370
+#: plugins/admin/departments/organization.tpl:105
+#: plugins/personal/generic/class_user.inc:1371
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:399
+#: plugins/personal/generic/generic.tpl:580
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr ""
 
@@ -2533,19 +2665,20 @@ msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr ""
 
@@ -2566,442 +2699,263 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl:4
-msgid ""
-"This is the GOsa main menu. You can select your tasks from the menu on the "
-"left, or by choosing one of the pictograms below. All changes apply directly "
-"to your companies LDAP server."
-msgstr ""
-
 #: plugins/generic/welcome/welcome.tpl:8
-msgid ""
-"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
-"back to the pictogram view."
-msgstr ""
-
-#: plugins/generic/welcome/welcome.tpl:15
 msgid "The GOsa team"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:84
-#: plugins/admin/groups/class_divListGroup.inc:80
-#: plugins/admin/users/class_divListUsers.inc:81
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/departments/locality.tpl:8
-#: plugins/admin/departments/generic.tpl:7
-#: plugins/admin/departments/country.tpl:8
-#: plugins/admin/departments/dcObject.tpl:8
-#: plugins/admin/departments/organization.tpl:7
-msgid "Properties"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:85
-#: plugins/admin/ogroups/class_divListOGroup.inc:152
-#: plugins/admin/groups/class_divListGroup.inc:81
-#: plugins/admin/groups/class_divListGroup.inc:126
-#: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/users/user-list.xml:62
-#: plugins/admin/departments/class_divListDepartment.inc:66
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/acl/class_divListACL.inc:74
-#: plugins/admin/acl/class_divListACL.inc:108
-msgid "Actions"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/groups/class_divListGroup.inc:85
-#: plugins/admin/groups/class_divListGroup.inc:87
-#: plugins/admin/groups/class_divListGroup.inc:89
-#: plugins/admin/groups/class_divListGroup.inc:91
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:85
-#: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:89
-#, php-format
-msgid "Show %s"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-msgid "application groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:976
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/group-list.tpl:13
+#: plugins/admin/groups/class_group.inc:1185
+#: plugins/admin/users/user-list.tpl:14
+#: plugins/admin/departments/locality.tpl:28
+#: plugins/admin/departments/generic.tpl:39
+#: plugins/admin/departments/class_domain.inc:92
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/class_organizationGeneric.inc:125
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:665
+#: 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:1689
+#: plugins/personal/generic/generic.tpl:170
+#: plugins/personal/posix/trustSelect/trust-list.tpl:15
+#: plugins/personal/posix/groupSelect/group-list.tpl:14
+#: setup/setup_ldap.tpl:55
+msgid "Base"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
+#: 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/singleUserSelect/singleUser-filter.tpl:4
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-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/class_divListOGroup.inc:115
-#: plugins/admin/groups/class_divListGroup.inc:100
-#: plugins/personal/posix/posix_groups.tpl:48
-msgid "Regular expression for matching group names"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:11
+msgid "Show department"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:148
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/departments/class_divListDepartment.inc:87
-#: plugins/admin/acl/class_divListACL.inc:104
-msgid "Submit department"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+msgid "Show users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:157
-#: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:124
-#: plugins/admin/users/user-list.xml:72
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/acl/class_divListACL.inc:112
-#: setup/class_setupStep_Migrate.inc:1035
-#: setup/class_setupStep_Migrate.inc:1051
-msgid "Create"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+msgid "Show groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
-#: plugins/admin/groups/class_divListGroup.inc:141
-#: plugins/admin/users/class_divListUsers.inc:138
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/class_divListDepartment.inc:110
-#: plugins/admin/acl/class_divListACL.inc:118
-#: plugins/personal/generic/generic_certs.tpl:21
-#: plugins/personal/generic/generic_certs.tpl:45
-#: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2862
-msgid "Remove"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+msgid "Show server"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:257
-#: plugins/admin/departments/class_divListDepartment.inc:158
-#: plugins/admin/acl/class_divListACL.inc:164
-#: plugins/admin/acl/class_divListACL.inc:184
-msgid "edit"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+msgid "Show workstation"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/departments/class_divListDepartment.inc:158
-msgid "Edit this entry"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+msgid "Show terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:281
-#: plugins/admin/departments/class_divListDepartment.inc:161
-#: plugins/admin/acl/class_divListACL.inc:191
-msgid "delete"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+msgid "Show printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/departments/class_divListDepartment.inc:161
-msgid "Delete this entry"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+msgid "Show phone"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:25
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:38
+#: plugins/admin/ogroups/ogroup-filter.tpl:25
+#: plugins/admin/ogroups/ogroup-filter.tpl:38
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/userSelect/user-filter.tpl:26
+#: plugins/admin/groups/group-filter.tpl:17
+#: plugins/admin/groups/group-filter.tpl:30
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:15
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:29
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:17
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:30
+#: plugins/admin/departments/dep-filter.tpl:9
+#: plugins/admin/departments/dep-filter.tpl:22
+#: plugins/admin/acl/acl-filter.tpl:17 plugins/admin/acl/acl-filter.tpl:30
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:20
+#: plugins/personal/posix/groupSelect/group-filter.tpl:17
+msgid "Filter options"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:283
-#: plugins/admin/groups/class_divListGroup.inc:304
-#: plugins/admin/users/class_divListUsers.inc:372
-#: plugins/admin/departments/class_divListDepartment.inc:201
-msgid "Number of listed departments"
+#: plugins/admin/ogroups/remove.tpl:6
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/class_ogroup.inc:1126
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:972
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/admin/groups/class_groupManagement.inc:407
-#: plugins/admin/groups/class_groupManagement.inc:461
-#: plugins/admin/groups/class_groupManagement.inc:492
-#: plugins/admin/users/class_userManagement.inc:555
-#: plugins/admin/users/class_userManagement.inc:559
-#: plugins/admin/departments/class_departmentManagement.inc:250
-#: plugins/admin/acl/class_aclManagement.inc:166
-#: plugins/admin/acl/class_aclManagement.inc:209
-#: plugins/admin/acl/class_aclManagement.inc:302
-#: plugins/admin/acl/class_aclManagement.inc:347
-msgid "Permission error"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
-#: plugins/admin/users/class_divListUsers.inc:126
-#: plugins/admin/users/user-list.xml:79 setup/setup_config2.tpl:227
-#: setup/setup_config2.tpl:272
-msgid "User"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:218
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
-msgid "departments"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
-msgid "people"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
-msgid "groups"
+#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/users/class_userManagement.inc:348
+#: plugins/admin/users/class_userManagement.inc:382
+#: plugins/admin/users/class_userManagement.inc:413
+msgid "none"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
-msgid "servers"
+#: plugins/admin/ogroups/class_ogroup.inc:356
+msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
-msgid "workstations"
+#: plugins/admin/ogroups/class_ogroup.inc:358
+msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
-msgid "terminals"
+#: plugins/admin/ogroups/class_ogroup.inc:359
+msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
-msgid "printer"
+#: plugins/admin/ogroups/class_ogroup.inc:360
+msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
-msgid "printers"
+#: plugins/admin/ogroups/class_ogroup.inc:361
+msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
-msgid "phones"
+#: plugins/admin/ogroups/class_ogroup.inc:362
+msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
-msgid "applications"
+#: plugins/admin/ogroups/class_ogroup.inc:363
+msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
-msgid "none"
+#: plugins/admin/ogroups/class_ogroup.inc:364
+msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
-msgid "too many different objects!"
+#: plugins/admin/ogroups/class_ogroup.inc:365
+msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
-msgid "users"
+#: plugins/admin/ogroups/class_ogroup.inc:366
+msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
-msgid "winstations"
+#: plugins/admin/ogroups/class_ogroup.inc:367
+msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:644
-#: setup/setup_config2.tpl:142
+#: plugins/admin/ogroups/class_ogroup.inc:412
+#: plugins/admin/groups/class_group.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:559
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:521
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:412
+#: plugins/admin/groups/class_group.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:559
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:571
-#: plugins/admin/groups/class_groupGeneric.inc:522
-#: plugins/personal/posix/class_posixAccount.inc:645
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/groups/class_group.inc:434
+#: plugins/personal/posix/class_posixAccount.inc:560
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:601
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:758
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1129
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:1150
-#: plugins/admin/groups/class_groupGeneric.inc:1162
-#: plugins/admin/groups/class_groupGeneric.inc:1176
-#: plugins/admin/groups/class_groupGeneric.inc:1183
-#: plugins/admin/groups/class_groupGeneric.inc:1307
-#: plugins/admin/users/class_userManagement.inc:776
-#: plugins/admin/users/class_userManagement.inc:850
-#: plugins/admin/users/class_userManagement.inc:862
-#: plugins/admin/departments/class_departmentGeneric.inc:307
-#: plugins/admin/departments/class_departmentGeneric.inc:309
-#: plugins/admin/departments/class_departmentGeneric.inc:314
-#: plugins/admin/departments/class_departmentGeneric.inc:321
-#: plugins/admin/departments/class_departmentGeneric.inc:325
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/acl/class_aclRole.inc:750
-#: plugins/admin/acl/class_aclRole.inc:762 plugins/admin/acl/paste_role.tpl:4
-#: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1246
-#: plugins/personal/generic/class_user.inc:1259
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/class_user.inc:1702 setup/setup_migrate.tpl:283
-#: setup/setup_feedback.tpl:31
-msgid "Name"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:792
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1121
+#: plugins/admin/ogroups/class_ogroup.inc:967
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1132
+#: plugins/admin/ogroups/class_ogroup.inc:978
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1133
+#: plugins/admin/ogroups/class_ogroup.inc:979
 msgid "Member"
 msgstr ""
 
@@ -3020,35 +2974,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/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:180
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr ""
-
-#: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1315
-#: plugins/personal/posix/generic.tpl:133
+#: plugins/admin/ogroups/generic.tpl:36
+#: plugins/admin/groups/class_group.inc:1191
+#: plugins/personal/posix/generic.tpl:143
 msgid "System trust"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:42 plugins/admin/groups/generic.tpl:169
-#: plugins/admin/groups/generic.tpl:203 plugins/personal/posix/generic.tpl:135
-#: plugins/personal/posix/generic.tpl:163
+#: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:146
+#: plugins/personal/posix/generic.tpl:176
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:70
+#: plugins/admin/ogroups/generic.tpl:65
 msgid "Member objects"
 msgstr ""
 
@@ -3075,10 +3013,10 @@ msgid "FAI summary"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_divListGroup.inc:198
-#: plugins/admin/users/class_divListUsers.inc:203
-#: plugins/admin/users/class_userManagement.inc:1086
-#: plugins/personal/posix/class_posixAccount.inc:303
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:775
+#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr ""
 
@@ -3090,20 +3028,112 @@ msgstr ""
 msgid "Please enter the new object group name"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:57 plugins/admin/users/user-list.xml:73
+#: plugins/admin/departments/locality.tpl:8
+#: plugins/admin/departments/generic.tpl:7
+#: plugins/admin/departments/domain.tpl:8
+#: plugins/admin/departments/country.tpl:8
+#: plugins/admin/departments/dcObject.tpl:8
+#: plugins/admin/departments/organization.tpl:7
+msgid "Properties"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:73
+#: plugins/admin/groups/group-list.xml:73 plugins/admin/users/user-list.xml:89
+#: plugins/admin/departments/dep-list.xml:98 plugins/admin/acl/acl-list.xml:76
+#: setup/class_setupStep_Migrate.inc:1035
+#: setup/class_setupStep_Migrate.inc:1051
+msgid "Create"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:98
+#: plugins/admin/groups/group-list.xml:98
+#: plugins/admin/users/user-list.xml:121
+#: plugins/admin/departments/dep-list.xml:160
+#: plugins/admin/departments/dep-list.xml:181
+#: plugins/admin/acl/acl-list.xml:95 plugins/admin/acl/acl-list.xml:144
+#: plugins/personal/generic/generic_certs.tpl:22
+#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:74
+#: setup/class_setupStep_Migrate.inc:2869
+msgid "Remove"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+msgid "Send message"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+msgid "Edit object group"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+msgid "Remove object group"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
 
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
+msgid "Filters"
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/groups/trust_machines.tpl:26
 msgid "Choose the department the search will be based on"
 msgstr ""
 
@@ -3117,25 +3147,21 @@ msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 msgid "Display systems of department"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
-#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:29
 msgid "Display systems matching"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 msgid "Regular expression for matching addresses"
 msgstr ""
 
@@ -3145,34 +3171,27 @@ msgid ""
 "do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:96
-msgid "Display users matching"
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:426
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1343
+#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1832
+msgid "Given name"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:47
-msgid "Regular expression for matching user names"
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1680
+msgid "Surname"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:44
+#: plugins/personal/generic/generic.tpl:58
+#: plugins/personal/generic/generic.tpl:76
 msgid "Multiple edit"
 msgstr ""
 
@@ -3181,384 +3200,243 @@ 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:83 plugins/admin/groups/generic.tpl:110
+#: 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:95 plugins/admin/groups/generic.tpl:118
+#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/generic.tpl:110
 msgid "in domain"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:140
+#: plugins/admin/groups/generic.tpl:131
 msgid "Members are in a phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:155
+#: plugins/admin/groups/generic.tpl:146
 msgid "Members are in a nagios group"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:245
+#: plugins/admin/groups/generic.tpl:236
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:252
+#: plugins/admin/groups/generic.tpl:243
 msgid "In all groups"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:255
+#: plugins/admin/groups/generic.tpl:246
 msgid "Not in all groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
+#: setup/setup_ldap.tpl:78
+msgid "Select user"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:201
-msgid "Posix"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:273
-#: plugins/admin/users/class_divListUsers.inc:285
-msgid "Not allowed"
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:163
+#: plugins/admin/groups/class_group.inc:162
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_group.inc:400
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:488
+#: plugins/admin/groups/class_group.inc:400
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:489
+#: plugins/admin/groups/class_group.inc:401
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:494
+#: plugins/admin/groups/class_group.inc:406
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:628
+#: 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:634
+#: 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:712
+#: plugins/admin/groups/class_group.inc:624
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:755
+#: 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:981
+#: plugins/admin/groups/class_group.inc:894
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:986
+#: plugins/admin/groups/class_group.inc:899
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1091
+#: plugins/admin/groups/class_group.inc:994
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1192
-#: plugins/admin/groups/class_groupGeneric.inc:1195
-#: plugins/admin/groups/class_groupGeneric.inc:1311
-#: plugins/personal/posix/class_posixAccount.inc:1115
-#: plugins/personal/posix/class_posixAccount.inc:1118
-#: plugins/personal/posix/generic.tpl:68
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1108
+#: plugins/admin/groups/class_group.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1031
+#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/posix/generic.tpl:75
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/personal/posix/class_posixAccount.inc:1413
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:1299
+#: plugins/admin/groups/class_group.inc:1175
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1313
+#: plugins/admin/groups/class_group.inc:1189
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1314
+#: plugins/admin/groups/class_group.inc:1190
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1316
+#: plugins/admin/groups/class_group.inc:1192
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1317
+#: plugins/admin/groups/class_group.inc:1193
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1319
+#: plugins/admin/groups/class_group.inc:1195
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr ""
-
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
+#: plugins/admin/groups/class_groupManagement.inc:26
 msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr ""
-
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr ""
-
-#: plugins/admin/users/user-filter.xml:102
-msgid "All"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:55
-#: plugins/admin/users/class_divListUsers.inc:56
-#: plugins/admin/users/user-list.xml:11
-msgid "List of users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:773
-#: plugins/admin/users/user-list.xml:87 plugins/admin/users/templatize.tpl:15
-msgid "Template"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:84
-msgid "templates"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "GOsa object"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "functional users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "POSIX users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "mail users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "samba users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "proxy users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:140
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
-msgid "Apply template"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:199
-msgid "GOsa"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:200
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:202
-msgid "Edit UNIX properties"
+#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:204
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
+#: plugins/admin/groups/class_groupManagement.inc:157
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
+msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:206
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:764
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:208
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:627
-#: plugins/admin/departments/generic.tpl:96
-#: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1282
-#: plugins/personal/generic/class_user.inc:1690
-#: plugins/personal/generic/generic.tpl:363
-#: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
-msgid "Fax"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:210
-msgid "Edit fax properies"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:768
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:214
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:215
-msgid "Create user from template"
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:784
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:216
-msgid "Create user with this template"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:247
-msgid "inactive"
+#: plugins/admin/groups/class_groupManagement.inc:189
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:250
-#: plugins/personal/posix/class_posixAccount.inc:162
-#: plugins/personal/posix/class_posixAccount.inc:164
-#: plugins/personal/posix/class_posixAccount.inc:166
-msgid "active"
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:776
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
+msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:258
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
+#: plugins/admin/users/remove.tpl:6 plugins/admin/acl/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
-msgid "password"
+#: plugins/admin/users/user-filter.xml:13
+msgid "Default filter"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:282
-msgid "Delete user"
+#: plugins/admin/users/user-filter.xml:33
+msgid "Show POSIX users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:371
-msgid "Number of listed users"
+#: plugins/admin/users/user-filter.xml:53
+msgid "Show mail users"
 msgstr ""
 
 #: plugins/admin/users/password.tpl:4
@@ -3584,9 +3462,9 @@ msgstr ""
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:30
-#: plugins/personal/generic/password.tpl:17
-#: plugins/personal/password/password.tpl:39
+#: plugins/admin/users/password.tpl:32
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/password/password.tpl:40
 msgid "Set password"
 msgstr ""
 
@@ -3601,116 +3479,108 @@ msgid ""
 "templates."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
-#: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/users/class_userManagement.inc:420
+#: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
+#: plugins/admin/users/templatize.tpl:15
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/paste_generic.tpl:8
 msgid "Last name"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
-#: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/paste_generic.tpl:12
 msgid "First name"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:278
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:667
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:668
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/users/class_userManagement.inc:853
-#: plugins/personal/generic/class_user.inc:1251
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/class_user.inc:1571
-#: plugins/personal/generic/class_user.inc:1699
-msgid "Given name"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:741
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:743
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1070
-#: plugins/personal/posix/class_posixAccount.inc:283
-#: plugins/personal/posix/class_posixAccount.inc:303
-#: plugins/personal/posix/class_posixAccount.inc:305
-#: plugins/personal/posix/class_posixAccount.inc:308
+#: plugins/admin/users/class_userManagement.inc:756
+msgid "Edit generic properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/class_posixAccount.inc:291
+#: plugins/personal/posix/class_posixAccount.inc:311
+#: plugins/personal/posix/class_posixAccount.inc:313
+#: plugins/personal/posix/class_posixAccount.inc:316
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:760
 msgid "Edit POSIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1091
-msgid "Edit FAX properties"
+#: plugins/admin/users/class_userManagement.inc:771
+msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:49
-msgid "Name / Department"
+#: plugins/admin/users/class_userManagement.inc:772
+msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:175
-msgid "Edit user"
+#: plugins/admin/users/class_userManagement.inc:780
+msgid "Edit FAX properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:184
-msgid "%{filter:lockLabel(userPassword)}"
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
-msgid "Remove user"
+#: plugins/admin/users/user-list.xml:140
+msgid "Lock users"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:11
-msgid "Show templates"
+#: plugins/admin/users/user-list.xml:148
+msgid "Unlock users"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:12
-msgid "Show functional users"
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
+#: plugins/admin/users/user-list.xml:199
+msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:14
-msgid "Show POSIX users"
+#: plugins/admin/users/user-list.xml:213
+msgid "Edit user"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:222
+msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:15
-msgid "Show samba users"
+#: plugins/admin/users/user-list.xml:245
+msgid "Remove user"
 msgstr ""
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3723,128 +3593,63 @@ msgid ""
 "defined in the template."
 msgstr ""
 
-#: plugins/admin/users/templatize.tpl:33
+#: plugins/admin/users/templatize.tpl:32
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:620
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/organization.tpl:27
-msgid "Category"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:623
-#: plugins/admin/departments/generic.tpl:65
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/multiple_generic.tpl:275
-msgid "State"
+"This includes 'all' accounts, systems, etc. in this subtree. Please double "
+"check if your really want to do this since there is no way for GOsa to get "
+"your data back."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:624
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1596
-#: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/multiple_generic.tpl:265
-msgid "Location"
+#: plugins/admin/departments/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:625
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:397
-#: plugins/personal/generic/multiple_generic.tpl:67
-#: plugins/personal/generic/multiple_generic.tpl:285
-msgid "Address"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:189
+msgid "Domain"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:629
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
-#: plugins/admin/departments/class_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/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/organization.tpl:114
-msgid "Administrative settings"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_countryGeneric.inc:82
+#: plugins/admin/departments/class_countryGeneric.inc:83
+msgid "Country"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_localityGeneric.inc:82
+#: plugins/admin/departments/class_localityGeneric.inc:83
+msgid "Locality"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:237
+#: plugins/admin/departments/class_organizationGeneric.inc:113
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/personal/generic/class_user.inc:1695
+#: plugins/personal/generic/generic.tpl:302 setup/setup_feedback.tpl:23
+msgid "Organization"
 msgstr ""
 
 #: plugins/admin/departments/locality.tpl:11
@@ -3858,26 +3663,52 @@ msgid "Name of locality to create"
 msgstr ""
 
 #: plugins/admin/departments/locality.tpl:22
-#: plugins/admin/departments/generic.tpl:22
+#: plugins/admin/departments/domain.tpl:22
 #: plugins/admin/departments/country.tpl:22
 #: plugins/admin/departments/dcObject.tpl:22
 #: plugins/admin/departments/organization.tpl:22
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:31
-#: plugins/admin/departments/generic.tpl:43
-#: 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"
+#: plugins/admin/departments/locality.tpl:39
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_domain.inc:93
+#: plugins/admin/departments/class_localityGeneric.inc:93
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_countryGeneric.inc:93
+#: plugins/admin/departments/class_dcObject.inc:92
+#: plugins/admin/departments/domain.tpl:39
+#: plugins/admin/departments/country.tpl:39
+#: plugins/admin/departments/dcObject.tpl:39
+#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/organization.tpl:51
+#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/generic.tpl:343
+#: plugins/personal/generic/generic.tpl:359
+msgid "Manager"
+msgstr ""
+
+#: plugins/admin/departments/locality.tpl:67
+#: plugins/admin/departments/generic.tpl:132
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/domain.tpl:67
+#: plugins/admin/departments/country.tpl:67
+#: plugins/admin/departments/dcObject.tpl:67
+#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/organization.tpl:131
+msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:52
-#: plugins/admin/departments/generic.tpl:116
-#: plugins/admin/departments/country.tpl:52
-#: plugins/admin/departments/dcObject.tpl:52
-#: plugins/admin/departments/organization.tpl:116
+#: plugins/admin/departments/locality.tpl:69
+#: plugins/admin/departments/generic.tpl:134
+#: plugins/admin/departments/domain.tpl:69
+#: plugins/admin/departments/country.tpl:69
+#: plugins/admin/departments/dcObject.tpl:69
+#: plugins/admin/departments/organization.tpl:133
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
@@ -3889,115 +3720,177 @@ msgstr ""
 msgid "Name of subtree to create"
 msgstr ""
 
+#: plugins/admin/departments/generic.tpl:22
+msgid "Descriptive text for   department"
+msgstr ""
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/organization.tpl:68
+#: plugins/admin/departments/generic.tpl:79
+#: plugins/admin/departments/generic.tpl:91
+#: plugins/admin/departments/class_localityGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/organization.tpl:78
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/generic.tpl:442
+msgid "Location"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:83
+#: plugins/admin/departments/class_organizationGeneric.inc:129
+#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1708
+#: plugins/personal/generic/generic.tpl:450
+msgid "State"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:86
+#: plugins/admin/departments/organization.tpl:85
 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:94
+#: plugins/admin/departments/organization.tpl:93
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:84
-#: plugins/admin/departments/organization.tpl:84
+#: plugins/admin/departments/generic.tpl:99
+#: plugins/admin/departments/class_department.inc:669
+#: plugins/admin/departments/organization.tpl:98
+#: plugins/personal/generic/generic.tpl:189
+#: plugins/personal/generic/generic.tpl:458
+msgid "Address"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:102
+#: plugins/admin/departments/organization.tpl:101
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/organization.tpl:91
+#: plugins/admin/departments/generic.tpl:109
+#: plugins/admin/departments/organization.tpl:108
 msgid "Base telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/organization.tpl:99
+#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:373
+#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/organization.tpl:113
+#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1823
+#: plugins/personal/generic/generic.tpl:424
+#: plugins/personal/generic/generic.tpl:592
+msgid "Fax"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/organization.tpl:116
 msgid "Base facsimile telephone number of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
+#: plugins/admin/departments/class_domain.inc:81
+#: plugins/admin/departments/class_domain.inc:82
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_dcObject.inc:81
+#: plugins/admin/departments/class_dcObject.inc:82
+msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:654
+#: plugins/admin/departments/class_department.inc:659
+msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/class_departmentManagement.inc:122
 msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
+"As soon as the tag operation has finished, you can scroll down to end of the "
+"page and    press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:336
-msgid ""
-"As soon as the tag operation has finished, you can scroll down to end of the "
-"page and press the 'Continue' button to continue with the department "
-"management dialog."
+#: plugins/admin/departments/class_organizationGeneric.inc:122
+msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#: plugins/admin/departments/class_dcObject.inc:77
-#: plugins/admin/departments/class_dcObject.inc:78
-msgid "Domain Component"
+#: plugins/admin/departments/class_organizationGeneric.inc:131
+#: plugins/personal/generic/class_user.inc:1710
+#: plugins/personal/generic/generic.tpl:187
+msgid "Postal address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:568
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
+#: plugins/admin/departments/class_countryGeneric.inc:91
+#: plugins/admin/departments/country.tpl:11
+msgid "Country name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
+#: plugins/admin/departments/domain.tpl:11
+msgid "Domain name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-msgid "Organization name"
+#: plugins/admin/departments/domain.tpl:14
+msgid "Name of domain to create"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1597
-msgid "Postal address"
+#: plugins/admin/departments/country.tpl:14
+msgid "Name of country to create"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-msgid "Phone number"
+#: plugins/admin/departments/class_department.inc:433
+msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:87
-#: plugins/admin/departments/country.tpl:11
-msgid "Country name"
+#: plugins/admin/departments/class_department.inc:501
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:582
+#, php-format
+msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
+#: plugins/admin/departments/class_department.inc:623
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/country.tpl:14
-msgid "Name of country to create"
+#: plugins/admin/departments/class_department.inc:662
+msgid "Department name"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:670
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:725
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:732
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:764
+#, php-format
+msgid "Removing tag from object '%s'"
 msgstr ""
 
 #: plugins/admin/departments/dep_iframe.tpl:1
@@ -4038,48 +3931,13 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/acl/remove.tpl:6
-msgid ""
-"This includes all system and setup informations. Please double check if your "
-"really want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-msgid "ACL role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:114
-#: plugins/admin/acl/class_divListACL.inc:152
-#: plugins/admin/acl/class_aclRole.inc:742
-#: plugins/personal/generic/class_user.inc:1555
-#: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/multiple_generic.tpl:345
-msgid "Role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
+#: plugins/admin/acl/class_aclManagement.inc:154
+msgid "ACL Assignment"
 msgstr ""
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
@@ -4087,7 +3945,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:726
 msgid "Access control roles"
 msgstr ""
 
@@ -4095,47 +3953,62 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:418
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:420
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:426
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:430
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:646
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: 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:753
+#: 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:1665
+#: plugins/personal/generic/generic.tpl:509
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:736
 msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl:11
+msgid "Show access control lists"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl:12
+msgid "Show roles"
 msgstr ""
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
@@ -4152,333 +4025,347 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:297
+msgid "Please add a single IP address or a network/netmask combination!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:340
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:316
+#: plugins/personal/generic/class_user.inc:340
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:414
+#: plugins/personal/generic/class_user.inc:396
+msgid "Password configuration"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:429
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:515
+#: plugins/personal/generic/class_user.inc:522
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:560
+#: plugins/personal/generic/class_user.inc:544
+#: plugins/personal/generic/class_user.inc:1691
+msgid "User picture"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:550
+#: plugins/personal/generic/generic.tpl:230
+#: plugins/personal/generic/generic_certs.tpl:3
+msgid "Certificates"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:569
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:570
+#: plugins/personal/generic/class_user.inc:579
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:573
+#: plugins/personal/generic/class_user.inc:582
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:574
+#: plugins/personal/generic/class_user.inc:583
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:588
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:605
+#: plugins/personal/generic/class_user.inc:614
 msgid "The selected password method is no longer available."
 msgstr ""
 
+#: plugins/personal/generic/class_user.inc:1205
+msgid "Cannot build RDN: no + allowed to build sub RDN!"
+msgstr ""
+
 #: plugins/personal/generic/class_user.inc:1212
+msgid "Cannot build RDN: attribute is not defined!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1230
+msgid "Cannot build RDN: invalid attribute parameters!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1301
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1601
-#: plugins/personal/generic/class_user.inc:1684
-#: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/multiple_generic.tpl:88
+#: plugins/personal/generic/class_user.inc:1366
+#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:205
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1285
-#: plugins/personal/generic/class_user.inc:1693
-#: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/multiple_generic.tpl:227
+#: plugins/personal/generic/class_user.inc:1377
+#: plugins/personal/generic/class_user.inc:1826
+#: plugins/personal/generic/generic.tpl:408
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1288
-#: plugins/personal/generic/class_user.inc:1696
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/multiple_generic.tpl:237
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1829
+#: plugins/personal/generic/generic.tpl:416
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:120
+msgid "Date of birth"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1544
-#: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/multiple_generic.tpl:371
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:532
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1545
-#: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/multiple_generic.tpl:402
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:557
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1546
-#: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/multiple_generic.tpl:302
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:474
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1547
-#: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/multiple_generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:601
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1548
-#: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/multiple_generic.tpl:360
+#: plugins/personal/generic/class_user.inc:1658
+#: plugins/personal/generic/generic.tpl:523
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1549
-#: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/multiple_generic.tpl:312
+#: plugins/personal/generic/class_user.inc:1659
+#: plugins/personal/generic/generic.tpl:482
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1550
-#: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/multiple_generic.tpl:323
+#: plugins/personal/generic/class_user.inc:1660
+#: plugins/personal/generic/generic.tpl:491
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1551
-#: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/multiple_generic.tpl:334
+#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/generic.tpl:500
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1552
-#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/class_user.inc:1662
+#: plugins/personal/generic/generic_certs.tpl:83
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/multiple_generic.tpl:460
-msgid "Public visible"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1554
-#: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/multiple_generic.tpl:382
+#: plugins/personal/generic/class_user.inc:1664
+#: plugins/personal/generic/generic.tpl:541
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1556
-#: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/multiple_generic.tpl:392
+#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/generic.tpl:549
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1670
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1564
-#: plugins/personal/posix/class_posixAccount.inc:1609
-#: plugins/personal/password/class_password.inc:145
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/posix/class_posixAccount.inc:1430
+#: plugins/personal/password/class_password.inc:150
+#: plugins/personal/myaccount/class_MyAccount.inc:5
+#: plugins/personal/myaccount/main.inc:125
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1570
-msgid "Surname"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1682
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1683
+#: plugins/personal/generic/generic.tpl:95
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1574
-#: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/multiple_generic.tpl:23
+#: plugins/personal/generic/class_user.inc:1684
+#: plugins/personal/generic/generic.tpl:105
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:119
-msgid "Date of birth"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1577
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:143
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1581
-#: plugins/personal/generic/paste_generic.tpl:47
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:1693
+msgid "Login restrictions"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/class_user.inc:1699
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/multiple_generic.tpl:189
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:334
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/class_user.inc:1702
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/class_user.inc:1705
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/class_user.inc:1706
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/class_user.inc:1712
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1600
+#: plugins/personal/generic/class_user.inc:1713
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1715
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1716
 msgid "User certificates"
 msgstr ""
 
+#: plugins/personal/generic/class_user.inc:1924
+msgid "Entries differ"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:3
 #: plugins/personal/generic/generic.tpl:6
-#: plugins/personal/generic/multiple_generic.tpl:5
+#: plugins/personal/generic/paste_generic.tpl:6
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
-#: plugins/personal/generic/multiple_generic.tpl:13
-#: plugins/personal/generic/paste_generic.tpl:37
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
-msgid "Personal picture"
+#: plugins/personal/generic/generic.tpl:11
+#: plugins/personal/generic/paste_generic.tpl:31
+#: plugins/personal/generic/generic_picture.tpl:2
+msgid "The users picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:24
 msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:62
-msgid "Template name"
+#: plugins/personal/generic/generic.tpl:37
+#: plugins/personal/generic/generic.tpl:84
+#: plugins/personal/posix/generic.tpl:51
+#: plugins/personal/posix/paste_generic.tpl:15
+#: plugins/personal/posix/posix_shadow.tpl:2
+msgid "Account settings"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:144
-msgid "Sex"
+#: plugins/personal/generic/generic.tpl:86
+msgid "Template name"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:157
-#: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:175
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:202
-#: plugins/personal/generic/multiple_generic.tpl:78
+#: plugins/personal/generic/generic.tpl:197
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:223
-#: plugins/personal/generic/multiple_generic.tpl:105
+#: plugins/personal/generic/generic.tpl:213
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:240
-#: plugins/personal/generic/multiple_generic.tpl:117
-#: plugins/personal/generic/generic_certs.tpl:3
-msgid "Certificates"
+#: plugins/personal/generic/generic.tpl:233
+msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:243
-#: plugins/personal/generic/multiple_generic.tpl:121
-msgid "Edit certificates"
+#: plugins/personal/generic/generic.tpl:245
+msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:251
-msgid "Last logon"
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:273
+msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:267
-#: plugins/personal/generic/multiple_generic.tpl:137
+#: plugins/personal/generic/generic.tpl:289
+#: plugins/personal/generic/generic.tpl:292
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/generic.tpl:521
+#: plugins/personal/generic/generic.tpl:570
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:295
-#: plugins/personal/generic/multiple_generic.tpl:169
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/generic.tpl:521
+#: plugins/personal/generic/generic.tpl:570
+msgid "part"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:318
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:303
-#: plugins/personal/generic/multiple_generic.tpl:179
+#: plugins/personal/generic/generic.tpl:326
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:329
-#: plugins/personal/generic/generic.tpl:511
-#: plugins/personal/generic/multiple_generic.tpl:207
-#: plugins/personal/generic/multiple_generic.tpl:418
+#: plugins/personal/generic/generic.tpl:390
+#: plugins/personal/generic/generic.tpl:572
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:525
+#: plugins/personal/generic/generic.tpl:586
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -4486,25 +4373,21 @@ msgstr ""
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl:23
-msgid "Clear password"
+#: plugins/personal/generic/paste_generic.tpl:3
+msgid "Paste user"
 msgstr ""
 
 #: plugins/personal/generic/paste_generic.tpl:24
-msgid "Set new password"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl:52
-#: plugins/personal/generic/generic_picture.tpl:27
-msgid "Remove picture"
+msgid "Clear password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:115
-msgid "You have no permission to set your password!"
+#: plugins/personal/generic/paste_generic.tpl:25
+msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:206
-msgid "Generic user information"
+#: plugins/personal/generic/paste_generic.tpl:42
+#: plugins/personal/generic/generic_picture.tpl:13
+msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/password.tpl:2
@@ -4514,237 +4397,286 @@ msgid ""
 "then encode it with the selected method."
 msgstr ""
 
+#: plugins/personal/generic/password.tpl:5
+msgid "Password change dialog"
+msgstr ""
+
+#: plugins/personal/generic/generic_certs.tpl:5
+msgid "The users standard certificate"
+msgstr ""
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl:33
+#: plugins/personal/generic/generic_certs.tpl:31
+msgid "The users S/MIME certificate"
+msgstr ""
+
+#: plugins/personal/generic/generic_certs.tpl:34
 msgid "S/MIME certificate"
 msgstr ""
 
 #: plugins/personal/generic/generic_certs.tpl:57
+msgid "The users PKCS12 certificate"
+msgstr ""
+
+#: plugins/personal/generic/generic_certs.tpl:60
 msgid "PKCS12 certificate"
 msgstr ""
 
+#: plugins/personal/generic/generic_picture.tpl:1
+msgid "Personal picture"
+msgstr ""
+
 #: plugins/personal/posix/class_posixAccount.inc:38
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:157
+#: plugins/personal/posix/class_posixAccount.inc:168
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:170
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:162
-msgid "password not changeable"
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
-msgid "password expired"
+#: plugins/personal/posix/class_posixAccount.inc:173
+msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:216
-msgid "unconfigured"
+#: plugins/personal/posix/class_posixAccount.inc:175
+msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:429
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/posix/class_posixAccount.inc:433
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:500
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:504
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:863
+#: plugins/personal/posix/class_posixAccount.inc:779
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:921
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:837
+#: plugins/personal/posix/class_posixAccount.inc:1155
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1016
+#: plugins/personal/posix/class_posixAccount.inc:932
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1097
-#: plugins/personal/posix/class_posixAccount.inc:1100
-#: plugins/personal/posix/class_posixAccount.inc:1170
-#: plugins/personal/posix/class_posixAccount.inc:1173
-#: plugins/personal/posix/class_posixAccount.inc:1615
-#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/class_posixAccount.inc:1013
+#: plugins/personal/posix/class_posixAccount.inc:1016
+#: plugins/personal/posix/class_posixAccount.inc:1091
+#: plugins/personal/posix/class_posixAccount.inc:1094
+#: plugins/personal/posix/class_posixAccount.inc:1436
+#: plugins/personal/posix/generic.tpl:8
+#: plugins/personal/posix/paste_generic.tpl:5
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1111
-#: plugins/personal/posix/generic.tpl:57
+#: plugins/personal/posix/class_posixAccount.inc:1024
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/generic.tpl:64
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1126
-#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1047
+#: plugins/personal/posix/class_posixAccount.inc:1100
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1131
-#: plugins/personal/posix/class_posixAccount.inc:1184
+#: plugins/personal/posix/class_posixAccount.inc:1052
+#: plugins/personal/posix/class_posixAccount.inc:1105
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1136
-#: plugins/personal/posix/class_posixAccount.inc:1189
+#: plugins/personal/posix/class_posixAccount.inc:1057
+#: plugins/personal/posix/class_posixAccount.inc:1110
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1150
-#: plugins/personal/posix/class_posixAccount.inc:1203
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1605
+#: plugins/personal/posix/class_posixAccount.inc:1426
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1616
-#: plugins/personal/posix/generic.tpl:15
+#: plugins/personal/posix/class_posixAccount.inc:1437
+#: plugins/personal/posix/generic.tpl:16
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1617
+#: plugins/personal/posix/class_posixAccount.inc:1438
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1618
+#: plugins/personal/posix/class_posixAccount.inc:1439
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1620
+#: plugins/personal/posix/class_posixAccount.inc:1441
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1621
+#: plugins/personal/posix/class_posixAccount.inc:1442
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1622
+#: plugins/personal/posix/class_posixAccount.inc:1443
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1623
+#: plugins/personal/posix/class_posixAccount.inc:1444
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1624
+#: plugins/personal/posix/class_posixAccount.inc:1445
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1625
+#: plugins/personal/posix/class_posixAccount.inc:1446
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1626
+#: plugins/personal/posix/class_posixAccount.inc:1447
+msgid "Public SSH key"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "System trust model"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:25
+#: plugins/personal/posix/generic.tpl:1
+msgid "POSIX settings"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:6
+msgid "Generic settings"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:26
 #: plugins/personal/posix/paste_generic.tpl:17
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:36
+#: plugins/personal/posix/generic.tpl:37
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:53
+#: plugins/personal/posix/generic.tpl:42
+msgid "Last logon"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:60
 #: plugins/personal/posix/paste_generic.tpl:31
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:83
-#: plugins/personal/posix/paste_generic.tpl:55
+#: plugins/personal/posix/generic.tpl:90
+#: plugins/personal/posix/paste_generic.tpl:54
+#: plugins/personal/posix/paste_generic.tpl:57
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:85
-#: plugins/personal/posix/paste_generic.tpl:62
+#: plugins/personal/posix/generic.tpl:93
+#: plugins/personal/posix/paste_generic.tpl:65
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:94
+#: plugins/personal/posix/generic.tpl:102
 msgid "Common group"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Non common group"
+#: plugins/personal/posix/generic.tpl:106
+msgid "Groups differ"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:126
+msgid "Account permissions"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:121
+#: plugins/personal/posix/generic.tpl:131
 msgid "SSH keys"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:122
+#: plugins/personal/posix/generic.tpl:132
 msgid "Edit public ssh keys..."
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:126
-msgid "Account"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show servers"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:32
-msgid "Display groups of department"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:14
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:44
-msgid "Display groups matching"
+#: plugins/personal/posix/trustSelect/trust-list.tpl:4
+msgid "List of systems"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:55
-msgid "Display groups of user"
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+msgid "List navigation"
 msgstr ""
 
+#: plugins/personal/posix/paste_generic.tpl:1
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:142
-msgid "POSIX settings"
+#: plugins/personal/posix/groupSelect/group-list.tpl:3
+msgid "Group selection"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:9
+#: plugins/personal/posix/posix_shadow.tpl:12
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/posix_shadow.tpl:34
+#: plugins/personal/posix/posix_shadow.tpl:59
+msgid "Password expiration settings"
+msgstr ""
+
+#: plugins/personal/posix/posix_shadow.tpl:62
 msgid "Password expires on"
 msgstr ""
 
@@ -4796,7 +4728,7 @@ msgstr ""
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:141
+#: plugins/personal/password/class_password.inc:146
 msgid "User password"
 msgstr ""
 
@@ -4804,10 +4736,18 @@ msgstr ""
 msgid "Password change not allowed"
 msgstr ""
 
-#: plugins/personal/password/nochange.tpl:6
+#: plugins/personal/password/nochange.tpl:7
 msgid "You have no permission to change your password at this time"
 msgstr ""
 
+#: plugins/personal/myaccount/class_MyAccount.inc:6
+msgid "Edit personal settings"
+msgstr ""
+
+#: plugins/personal/myaccount/main.inc:112
+msgid "You have no permission to set your password!"
+msgstr ""
+
 #: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr ""
@@ -4932,46 +4872,38 @@ msgid "Government mode"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
-msgstr ""
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
+msgid "GOsa logging"
 msgstr ""
 
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr ""
-
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr ""
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr ""
 
@@ -5019,13 +4951,17 @@ msgstr ""
 #: setup/setup_migrate.tpl:54 setup/class_setupStep_Migrate.inc:376
 #: setup/class_setupStep_Migrate.inc:665 setup/class_setupStep_Migrate.inc:805
 #: setup/class_setupStep_Migrate.inc:1034
-#: setup/class_setupStep_Migrate.inc:2127
-#: setup/class_setupStep_Migrate.inc:2568
-#: setup/class_setupStep_Migrate.inc:2722
-#: setup/class_setupStep_Migrate.inc:3052
+#: setup/class_setupStep_Migrate.inc:2132
+#: setup/class_setupStep_Migrate.inc:2575
+#: setup/class_setupStep_Migrate.inc:2729
+#: setup/class_setupStep_Migrate.inc:3059
 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 ""
@@ -5266,6 +5202,10 @@ msgstr ""
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -5528,10 +5468,6 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:330 setup/setup_config3.tpl:333
-msgid "Enabled"
-msgstr ""
-
 #: setup/setup_feedback.tpl:5
 msgid "Feedback sucessfully send"
 msgstr ""
@@ -5568,14 +5504,14 @@ msgstr ""
 #: setup/setup_feedback.tpl:62 setup/setup_feedback.tpl:80
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr ""
 
 #: setup/setup_feedback.tpl:64 setup/setup_feedback.tpl:82
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr ""
 
@@ -5717,10 +5653,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr ""
 
-#: setup/setup_ldap.tpl:78
-msgid "Select user"
-msgstr ""
-
 #: setup/setup_ldap.tpl:86
 msgid "Automatically append LDAP base to admin DN"
 msgstr ""
@@ -5770,7 +5702,7 @@ msgid "Checking for invisible users"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:165
-#: setup/class_setupStep_Migrate.inc:3203
+#: setup/class_setupStep_Migrate.inc:3210
 msgid "Checking for super administrator"
 msgstr ""
 
@@ -5811,10 +5743,10 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:492 setup/class_setupStep_Migrate.inc:569
 #: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:795
 #: setup/class_setupStep_Migrate.inc:891
-#: setup/class_setupStep_Migrate.inc:2032
-#: setup/class_setupStep_Migrate.inc:2498
-#: setup/class_setupStep_Migrate.inc:2689
-#: setup/class_setupStep_Migrate.inc:2826
+#: setup/class_setupStep_Migrate.inc:2037
+#: setup/class_setupStep_Migrate.inc:2505
+#: setup/class_setupStep_Migrate.inc:2696
+#: setup/class_setupStep_Migrate.inc:2833
 msgid "LDAP query failed"
 msgstr ""
 
@@ -5823,10 +5755,10 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:493 setup/class_setupStep_Migrate.inc:570
 #: setup/class_setupStep_Migrate.inc:655 setup/class_setupStep_Migrate.inc:796
 #: setup/class_setupStep_Migrate.inc:892
-#: setup/class_setupStep_Migrate.inc:2033
-#: setup/class_setupStep_Migrate.inc:2499
-#: setup/class_setupStep_Migrate.inc:2690
-#: setup/class_setupStep_Migrate.inc:2827
+#: setup/class_setupStep_Migrate.inc:2038
+#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2697
+#: setup/class_setupStep_Migrate.inc:2834
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
@@ -5844,12 +5776,12 @@ msgstr ""
 #: setup/class_setupStep_Migrate.inc:597
 #: setup/class_setupStep_Migrate.inc:1031
 #: setup/class_setupStep_Migrate.inc:1049
-#: setup/class_setupStep_Migrate.inc:1984
-#: setup/class_setupStep_Migrate.inc:1997
-#: setup/class_setupStep_Migrate.inc:2052
-#: setup/class_setupStep_Migrate.inc:2073
-#: setup/class_setupStep_Migrate.inc:2125
-#: setup/class_setupStep_Migrate.inc:3205
+#: setup/class_setupStep_Migrate.inc:1989
+#: setup/class_setupStep_Migrate.inc:2002
+#: setup/class_setupStep_Migrate.inc:2057
+#: setup/class_setupStep_Migrate.inc:2078
+#: setup/class_setupStep_Migrate.inc:2130
+#: setup/class_setupStep_Migrate.inc:3212
 msgid "Failed"
 msgstr ""
 
@@ -5885,7 +5817,7 @@ msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
-#: setup/class_setupStep_Migrate.inc:1116
+#: setup/class_setupStep_Migrate.inc:1119
 msgid "Migration error"
 msgstr ""
 
@@ -5912,121 +5844,121 @@ msgstr ""
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1116
+#: setup/class_setupStep_Migrate.inc:1119
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1154
-#: setup/class_setupStep_Migrate.inc:1164
+#: setup/class_setupStep_Migrate.inc:1157
+#: setup/class_setupStep_Migrate.inc:1167
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1154
+#: setup/class_setupStep_Migrate.inc:1157
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1159
+#: setup/class_setupStep_Migrate.inc:1162
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1164
+#: setup/class_setupStep_Migrate.inc:1167
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1200
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1236
-#: setup/class_setupStep_Migrate.inc:1285
-#: setup/class_setupStep_Migrate.inc:1334
+#: setup/class_setupStep_Migrate.inc:1239
+#: setup/class_setupStep_Migrate.inc:1288
+#: setup/class_setupStep_Migrate.inc:1337
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1249
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1257
-#: setup/class_setupStep_Migrate.inc:1306
+#: setup/class_setupStep_Migrate.inc:1260
+#: setup/class_setupStep_Migrate.inc:1309
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1296
+#: setup/class_setupStep_Migrate.inc:1299
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1344
+#: setup/class_setupStep_Migrate.inc:1347
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1354
+#: setup/class_setupStep_Migrate.inc:1357
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1985
+#: setup/class_setupStep_Migrate.inc:1990
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1986
-#: setup/class_setupStep_Migrate.inc:1999
+#: setup/class_setupStep_Migrate.inc:1991
+#: setup/class_setupStep_Migrate.inc:2004
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1998
+#: setup/class_setupStep_Migrate.inc:2003
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2053
+#: setup/class_setupStep_Migrate.inc:2058
 #, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2054
+#: setup/class_setupStep_Migrate.inc:2059
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2075
+#: setup/class_setupStep_Migrate.inc:2080
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2432
+#: setup/class_setupStep_Migrate.inc:2439
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2567
+#: setup/class_setupStep_Migrate.inc:2574
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2627
+#: setup/class_setupStep_Migrate.inc:2634
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
-#: setup/class_setupStep_Migrate.inc:2764
+#: setup/class_setupStep_Migrate.inc:2654
+#: setup/class_setupStep_Migrate.inc:2771
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2720
+#: setup/class_setupStep_Migrate.inc:2727
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:3051
+#: setup/class_setupStep_Migrate.inc:3058
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""