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 26f4e19ef7b5ed6c5a0ab71ce861ea5869b3f27e..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: 2010-02-12 19:47+0100\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,20 +16,156 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: 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/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:414 html/index.php:420
-#: include/functions.inc:929 include/functions.inc:2642
-#: include/functions.inc:2646 include/functions.inc:2652
-#: include/class_tabs.inc:268 include/utils/class_xml.inc:37
+#: 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_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: 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:793
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: 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
@@ -60,7 +196,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
+#: 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
@@ -91,7 +227,7 @@ 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/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"
@@ -132,7 +268,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/utils/class_msgPool.inc:327
+#: include/utils/class_msgPool.inc:330
 #, php-format
 msgid "Save"
 msgstr ""
@@ -172,7 +308,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set"
 msgstr ""
@@ -196,7 +332,7 @@ 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:321 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
@@ -256,9 +392,9 @@ msgstr ""
 #: 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:249
-#: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
+#: plugins/personal/myaccount/main.inc:97
 msgid "New password"
 msgstr ""
 
@@ -313,8 +449,8 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:20
 #: 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:472
-#: plugins/admin/departments/class_department.inc:560
+#: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
+#: plugins/admin/departments/class_department.inc:618
 msgid "Object"
 msgstr ""
 
@@ -352,9 +488,9 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
-#: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:500
-#: plugins/admin/departments/class_department.inc:582
+#: plugins/admin/users/template.tpl:49
+#: plugins/admin/departments/class_department.inc:558
+#: plugins/admin/departments/class_department.inc:640
 msgid "Continue"
 msgstr ""
 
@@ -363,17 +499,16 @@ msgstr ""
 #: 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:477 include/functions.inc:3349
-#: include/functions.inc:3363 include/functions.inc:3393
-#: include/functions.inc:3401 include/functions.inc:3413
-#: include/functions.inc:3417 include/functions.inc:3432
-#: include/functions.inc:3441 include/functions.inc:3501
-#: include/class_tabs.inc:56 include/class_plugin.inc:658
-#: include/class_plugin.inc:700 include/class_plugin.inc:743
-#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: include/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:454
-#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
+#: 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
@@ -384,25 +519,25 @@ msgstr ""
 #: 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:500
+#: 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:1230
-#: plugins/admin/departments/class_department.inc:250
+#: 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:279
-#: plugins/personal/generic/class_user.inc:382
-#: plugins/personal/generic/class_user.inc:477
-#: plugins/personal/generic/class_user.inc:754
-#: plugins/personal/generic/class_user.inc:1143
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1168
-#: plugins/personal/generic/class_user.inc:1433
-#: plugins/personal/generic/class_user.inc:1709
-#: plugins/personal/generic/main.inc:115
+#: 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
@@ -411,7 +546,7 @@ msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:61
 #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:218 setup/setup_ldap.tpl:121
 msgid "Information"
 msgstr ""
 
@@ -419,7 +554,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
+#: 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
@@ -447,7 +582,7 @@ msgstr ""
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:339
+#: 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
@@ -508,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 ""
 
@@ -551,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:207
+#: include/class_pluglist.inc:229
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -577,9 +713,9 @@ msgstr ""
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:447
+#: html/password.php:58 html/main.php:149 include/functions.inc:447
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:372
+#: plugins/admin/departments/class_department.inc:433
 msgid "Fatal error"
 msgstr ""
 
@@ -589,16 +725,16 @@ msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
-#: html/main.php:228
+#: 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:800
-#: include/functions.inc:3023 include/functions.inc:3055
-#: include/functions.inc:3068 include/utils/class_timezone.inc:47
-#: include/class_config.inc:155 include/class_config.inc:695
-#: include/class_config.inc:1146 include/class_config.inc:1159
-#: include/class_config.inc:1177 include/class_pluglist.inc:177
+#: 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
@@ -614,7 +750,7 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:567
+#: html/password.php:159 plugins/personal/generic/class_user.inc:614
 msgid "Password method"
 msgstr ""
 
@@ -623,8 +759,8 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
-#: plugins/personal/generic/main.inc:92
 #: 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."
@@ -639,14 +775,15 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: 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:1266
-#: plugins/personal/generic/class_user.inc:1284
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:82
-#: plugins/personal/generic/paste_generic.tpl:15
+#: 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 ""
 
@@ -704,30 +841,30 @@ msgstr ""
 #: 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:564 include/functions.inc:815
-#: include/functions.inc:864 include/functions.inc:921
-#: include/functions.inc:974 include/functions.inc:3002
-#: include/functions.inc:3275 include/class_plugin.inc:1289
-#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
-#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
-#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
-#: include/class_plugin.inc:1537 include/class_ldap.inc:753
-#: include/class_ldap.inc:1219 include/class_config.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:915
-#: plugins/admin/ogroups/class_ogroup.inc:929
+#: 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:1027
-#: plugins/admin/departments/class_department.inc:218
-#: plugins/admin/departments/class_department.inc:415
-#: plugins/admin/departments/class_department.inc:688
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/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:685
-#: plugins/personal/generic/class_user.inc:1065
-#: plugins/personal/posix/class_posixAccount.inc:631
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: 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
@@ -781,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:285
-msgid "User ACL checks disabled"
+#: html/main.php:288
+msgid "ACLs are disabled"
+msgstr ""
+
+#: html/main.php:288 html/main.php:290
+#, php-format
+msgid "You're logged in as %s"
 msgstr ""
 
-#: html/main.php:339
+#: html/main.php:340
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:349
+#: html/main.php:350
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:350
+#: html/main.php:351
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:364
+#: html/main.php:366
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:365
+#: html/main.php:367
 #, php-format
 msgid ""
 "FATAL: not all POST variables have been transfered by PHP - please inform "
@@ -854,39 +996,31 @@ msgstr ""
 msgid "unconfigured"
 msgstr ""
 
-#: include/class_management.inc:145
-msgid "Filter error"
-msgstr ""
-
-#: include/class_management.inc:145
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc: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:1560
-#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
-#: include/class_plugin.inc:1600
+#: 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:618
+#: plugins/admin/users/class_userManagement.inc:629
 msgid "Permission"
 msgstr ""
 
-#: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:576
-#: plugins/admin/users/class_userManagement.inc:580
+#: 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:1560
+#: 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:1572
-#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
+#: 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 ""
@@ -912,19 +1046,23 @@ 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:1147 include/class_config.inc:1178
+#: 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:1160
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1167
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -975,32 +1113,30 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1608
+#: plugins/personal/generic/class_user.inc:1675
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:233 plugins/admin/groups/class_group.inc:1189
+#: 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:496 include/class_listing.inc:239
-#: include/class_listing.inc:996 include/class_listing.inc:998
-#: include/class_sortableListing.inc:225
+#: 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:498 include/class_listing.inc:239
-#: include/class_sortableListing.inc:225
+#: 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:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:91
 #: plugins/admin/users/user-list.xml:114
@@ -1012,7 +1148,7 @@ msgstr ""
 
 #: 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:401
+#: 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
@@ -1020,8 +1156,7 @@ msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
@@ -1085,10 +1220,10 @@ msgstr ""
 
 #: include/class_acl.inc:960 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:604 include/functions.inc:790
-#: include/functions.inc:908 include/functions.inc:1306
-#: include/functions.inc:2370 include/functions.inc:2404
-#: include/functions.inc:2424 include/class_ldap.inc:693
+#: 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
@@ -1140,7 +1275,7 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: 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
@@ -1148,88 +1283,75 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:519
+#: include/class_listing.inc:527
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:988
-msgid "Go to root department"
-msgstr ""
-
-#: include/class_listing.inc:988 include/class_listing.inc:990
+#: include/class_listing.inc:999 include/class_listing.inc:1001
 #: include/class_baseSelector.inc:159
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:996
+#: include/class_listing.inc:1006 include/class_listing.inc:1008
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1004
+#: include/class_listing.inc:1014 include/class_listing.inc:1016
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
-msgid "Home"
-msgstr ""
-
-#: include/class_listing.inc:1011
+#: include/class_listing.inc:1021
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1011 include/class_baseSelector.inc:206
-msgid "Submit"
-msgstr ""
-
-#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
+#: 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:1376 include/class_listing.inc:1426
-#: include/class_plugin.inc:2084
+#: include/class_listing.inc:1386 include/class_plugin.inc:1958
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1382 include/class_listing.inc:1416
-#: include/class_plugin.inc:2088
+#: include/class_listing.inc:1392 include/class_plugin.inc:1962
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1390 include/class_listing.inc:1392
-#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
+#: 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:1416 include/class_plugin.inc:2042
+#: include/class_listing.inc:1425 include/class_plugin.inc:1916
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1426 include/class_plugin.inc:2050
+#: include/class_listing.inc:1434 include/class_plugin.inc:1924
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1458 include/class_listing.inc:1460
+#: include/class_listing.inc:1466 include/class_listing.inc:1468
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1474
+#: include/class_listing.inc:1482
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1509 include/class_listing.inc:1510
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
+#: include/class_listing.inc:1516 include/class_SnapShotDialog.inc:135
+#: include/class_plugin.inc:1890
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2023
-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:1520 include/class_plugin.inc:2024
-msgid "Create a new snapshot from this object"
+#: include/class_sortableListing.inc:189
+msgid "Sortable list"
 msgstr ""
 
 #: include/class_sortableListing.inc:194
@@ -1260,247 +1382,247 @@ msgstr ""
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:790 include/functions.inc:908
+#: include/functions.inc:792 include/functions.inc:910
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:800
+#: include/functions.inc:802
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:800
+#: include/functions.inc:802
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:929
+#: 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:1233
+#: include/functions.inc:1235
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1235
+#: 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:1247 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1249 plugins/personal/generic/generic.tpl:222
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1252
+#: include/functions.inc:1254
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1642
+#: include/functions.inc:1644
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1644
+#: include/functions.inc:1646
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1646
+#: include/functions.inc:1648
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1886
+#: include/functions.inc:1888
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1915 include/class_filter.inc:314
+#: include/functions.inc:1917
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2227 include/class_filter.inc:280
+#: include/functions.inc:2229
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2273
+#: include/functions.inc:2275
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2370
+#: include/functions.inc:2372
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2404 include/functions.inc:2424
+#: include/functions.inc:2406 include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2642 include/functions.inc:2646
-#: include/functions.inc:2652
+#: include/functions.inc:2644 include/functions.inc:2648
+#: include/functions.inc:2654
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2676
+#: include/functions.inc:2678
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2676
+#: include/functions.inc:2678
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2702
+#: include/functions.inc:2704
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2709
+#: include/functions.inc:2711
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2754
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2757
+#: include/functions.inc:2759
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2762
+#: include/functions.inc:2764
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2765
+#: include/functions.inc:2767
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2787
+#: 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:2788
+#: include/functions.inc:2790
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2792
+#: 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:2793
+#: include/functions.inc:2795
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2817
+#: include/functions.inc:2819
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2818
+#: include/functions.inc:2820
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2819
+#: include/functions.inc:2821
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2820
+#: include/functions.inc:2822
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2821
+#: include/functions.inc:2823
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2822
+#: include/functions.inc:2824
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2823
+#: include/functions.inc:2825
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2825
+#: include/functions.inc:2827
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2826
+#: include/functions.inc:2828
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2827
+#: include/functions.inc:2829
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:3022
+#: include/functions.inc:3024
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3055
+#: include/functions.inc:3057
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3068
+#: include/functions.inc:3070
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3401 include/functions.inc:3413
-#: include/functions.inc:3417 include/functions.inc:3432
-#: include/functions.inc:3441
+#: 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:3349
+#: include/functions.inc:3351
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3363
+#: include/functions.inc:3365
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3393
+#: include/functions.inc:3395
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3401
+#: include/functions.inc:3403
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3415 include/functions.inc:3419
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3441
+#: include/functions.inc:3443
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3501
+#: include/functions.inc:3503
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -1511,12 +1633,12 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:268
+#: include/class_tabs.inc:241
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:406
+#: include/class_tabs.inc:379
 msgid "References"
 msgstr ""
 
@@ -1533,42 +1655,6 @@ msgstr ""
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:171
-#: plugins/generic/references/contents.tpl:11
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
-#: plugins/admin/ogroups/class_ogroup.inc:1004
-#: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:1193
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/locality.tpl:19
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:298
-#: plugins/admin/departments/class_department.inc:605
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-msgid "Description"
-msgstr ""
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -1613,97 +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:321 include/utils/class_msgPool.inc:24
+#: 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_userFilter.inc:62
+msgid "Options"
+msgstr ""
+
+#: include/class_filter.inc:451 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
-#: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
 msgstr ""
 
-#: include/class_plugin.inc:509
+#: include/class_filter.inc:456
+msgid "Edit filters"
+msgstr ""
+
+#: include/class_userFilterEditor.inc:159
+#, php-format
+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:1814
+#: include/class_plugin.inc:1688
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1814
+#: include/class_plugin.inc:1688
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
+#: 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:1998 include/class_plugin.inc:2000
+#: include/class_plugin.inc:1872 include/class_plugin.inc:1874
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2042
+#: include/class_plugin.inc:1897
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_plugin.inc:1916
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2050
+#: include/class_plugin.inc:1924
 msgid "copy"
 msgstr ""
 
@@ -1977,315 +2087,316 @@ msgstr ""
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:295
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:293
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:293
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:296
+#: include/utils/class_msgPool.inc:299
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:303
+#: include/utils/class_msgPool.inc:306
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:333
+#: 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:250
+#: 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:333
+#: include/utils/class_msgPool.inc:336
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:339
+#: include/utils/class_msgPool.inc:342
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:345
+#: include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:351
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:351
+#: include/utils/class_msgPool.inc:354
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:357
+#: include/utils/class_msgPool.inc:360
 msgid "Back"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:377
+#: include/utils/class_msgPool.inc:380
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:383
+#: 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:386 include/utils/class_msgPool.inc:393
+#: 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:402
+#: 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:405 include/utils/class_msgPool.inc:412
+#: 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:420
+#: include/utils/class_msgPool.inc:423
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:426
+#: include/utils/class_msgPool.inc:429
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:432
+#: include/utils/class_msgPool.inc:435
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "January"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "February"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "March"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "April"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "May"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "June"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "July"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "August"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "September"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "October"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "November"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "December"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Sunday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Monday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:453
+#: include/utils/class_msgPool.inc:456
 msgid "MySQL operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:465
+#: include/utils/class_msgPool.inc:468
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:467
+#: include/utils/class_msgPool.inc:470
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:485
 msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:485
+#: include/utils/class_msgPool.inc:488
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:492
+#: include/utils/class_msgPool.inc:495
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:497
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
+#: 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:507
+#: include/utils/class_msgPool.inc:510
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:509
+#: 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:515
+#: include/utils/class_msgPool.inc:518
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:521
+#: include/utils/class_msgPool.inc:524
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:527
+#: include/utils/class_msgPool.inc:530
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:533
+#: 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:539
+#: include/utils/class_msgPool.inc:542
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:545
+#: include/utils/class_msgPool.inc:548
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:551
+#: include/utils/class_msgPool.inc:554
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:557
+#: include/utils/class_msgPool.inc:560
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:563
+#: include/utils/class_msgPool.inc:566
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:569
+#: 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/utils/class_msgPool.inc:575
+#: include/utils/class_msgPool.inc:578
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2369,34 +2480,36 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:318
+#: include/class_config.inc:325
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:695
+#: include/class_config.inc:702
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1105
+#: include/class_config.inc:1112
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:1105
+#: 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:197 include/class_pluglist.inc:198
-#: include/class_pluglist.inc:311
+#: 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 ""
 
@@ -2445,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:993
-#: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:744
-#: plugins/admin/departments/class_department.inc:595
+#: 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:1602
-#: 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 ""
 
@@ -2464,7 +2581,7 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/admin/users/class_userManagement.inc:762
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr ""
@@ -2472,14 +2589,14 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:756
-#: plugins/personal/posix/class_posixAccount.inc:324
+#: 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:768
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "FAX"
 msgstr ""
 
@@ -2498,7 +2615,7 @@ msgstr ""
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
-#: plugins/personal/posix/groupSelect/group-list.xml:15
+#: plugins/personal/posix/groupSelect/group-list.xml:13
 msgid "Group"
 msgstr ""
 
@@ -2508,10 +2625,9 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:237
-#: plugins/personal/generic/class_user.inc:1629
-#: plugins/personal/generic/generic.tpl:288
-#: plugins/personal/generic/multiple_generic.tpl:159
+#: plugins/admin/departments/class_departmentManagement.inc:249
+#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/generic.tpl:310
 msgid "Department"
 msgstr ""
 
@@ -2519,16 +2635,14 @@ msgstr ""
 #: 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:772
-#: plugins/admin/departments/generic.tpl:82
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1309
-#: plugins/personal/generic/class_user.inc:1739
-#: plugins/personal/generic/generic.tpl:339
-#: plugins/personal/generic/generic.tpl:520
-#: plugins/personal/generic/multiple_generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/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 ""
@@ -2585,28 +2699,16 @@ 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/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:11
+#: plugins/personal/posix/groupSelect/group-list.xml:10
 msgid "Please select the desired entries"
 msgstr ""
 
@@ -2619,104 +2721,43 @@ msgstr ""
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
 #: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/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/objectSelect/selectObject-list.xml:97
-#: plugins/admin/ogroups/class_ogroup.inc:799
-#: plugins/admin/ogroups/class_ogroup.inc:814
-#: plugins/admin/ogroups/class_ogroup.inc:1002
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:1054
-#: plugins/admin/groups/class_group.inc:1065
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1084
-#: plugins/admin/groups/class_group.inc:1098
-#: plugins/admin/groups/class_group.inc:1105
-#: plugins/admin/groups/class_group.inc:1192
-#: plugins/admin/users/class_userManagement.inc:412
-#: plugins/admin/users/class_userManagement.inc:459
-#: plugins/admin/departments/class_domain.inc:43
-#: plugins/admin/departments/class_domain.inc:45
-#: plugins/admin/departments/class_domain.inc:50
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:288
-#: plugins/admin/departments/class_department.inc:290
-#: plugins/admin/departments/class_department.inc:295
-#: plugins/admin/departments/class_department.inc:302
-#: plugins/admin/departments/class_department.inc:306
-#: plugins/admin/acl/class_aclRole.inc:733
-#: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1271
-#: plugins/personal/generic/class_user.inc:1289
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1754
-#: plugins/personal/posix/trustSelect/trust-list.xml:56
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
-msgid "Name"
-msgstr ""
-
 #: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
 #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/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:1194
-#: plugins/admin/users/user-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:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/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:607
+#: 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:1622
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
-#: plugins/personal/posix/trustSelect/trust-list.tpl:13
-#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: 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 ""
@@ -2725,8 +2766,8 @@ msgstr ""
 #: 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/users/user-filter.tpl:3
 #: plugins/admin/departments/dep-filter.tpl:3
 #: plugins/admin/acl/acl-filter.tpl:3
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:3
@@ -2768,6 +2809,26 @@ msgstr ""
 msgid "Show phone"
 msgstr ""
 
+#: 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/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2775,7 +2836,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:999
+#: plugins/admin/ogroups/class_ogroup.inc:972
 msgid "Object groups"
 msgstr ""
 
@@ -2797,104 +2858,104 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:249
+#: 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:385
-#: plugins/admin/users/class_userManagement.inc:337
-#: plugins/admin/users/class_userManagement.inc:371
-#: plugins/admin/users/class_userManagement.inc:402
+#: 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:387
+#: plugins/admin/ogroups/class_ogroup.inc:356
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:389
+#: plugins/admin/ogroups/class_ogroup.inc:358
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:390
+#: plugins/admin/ogroups/class_ogroup.inc:359
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:360
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:392
+#: plugins/admin/ogroups/class_ogroup.inc:361
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:393
+#: plugins/admin/ogroups/class_ogroup.inc:362
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:394
+#: plugins/admin/ogroups/class_ogroup.inc:363
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:364
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:365
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:366
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:367
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/ogroups/class_ogroup.inc:412
 #: plugins/admin/groups/class_group.inc:433
-#: plugins/personal/posix/class_posixAccount.inc:573
+#: plugins/personal/posix/class_posixAccount.inc:559
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/ogroups/class_ogroup.inc:412
 #: plugins/admin/groups/class_group.inc:433
-#: plugins/personal/posix/class_posixAccount.inc:573
+#: plugins/personal/posix/class_posixAccount.inc:559
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/ogroups/class_ogroup.inc:413
 #: plugins/admin/groups/class_group.inc:434
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:560
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:632
+#: plugins/admin/ogroups/class_ogroup.inc:601
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:789
+#: 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:819
+#: 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:994
+#: plugins/admin/ogroups/class_ogroup.inc:967
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:978
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1006
+#: plugins/admin/ogroups/class_ogroup.inc:979
 msgid "Member"
 msgstr ""
 
@@ -2914,14 +2975,14 @@ msgid "Descriptive text for this group"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:36
-#: plugins/admin/groups/class_group.inc:1200
-#: plugins/personal/posix/generic.tpl:139
+#: plugins/admin/groups/class_group.inc:1191
+#: plugins/personal/posix/generic.tpl:143
 msgid "System trust"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:37 plugins/admin/groups/generic.tpl:160
-#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:141
-#: plugins/personal/posix/generic.tpl:169
+#: plugins/admin/groups/generic.tpl:194 plugins/personal/posix/generic.tpl:146
+#: plugins/personal/posix/generic.tpl:176
 msgid "Trust mode"
 msgstr ""
 
@@ -2953,8 +3014,8 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:764
-#: plugins/personal/posix/class_posixAccount.inc:324
+#: 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 ""
@@ -3036,9 +3097,9 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/acl/acl-list.xml:95 plugins/admin/acl/acl-list.xml:144
-#: plugins/personal/generic/generic_certs.tpl:21
-#: plugins/personal/generic/generic_certs.tpl:45
-#: plugins/personal/generic/generic_certs.tpl:69
+#: 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 ""
@@ -3063,7 +3124,6 @@ msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/trust_machines.tpl:19
-#: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr ""
 
@@ -3074,8 +3134,6 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
 msgstr ""
 
@@ -3089,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:25
-#: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:29
-#: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:30
-#: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr ""
 
@@ -3118,24 +3172,26 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:415
+#: 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:1281
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/class_user.inc:1751
+#: 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/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:1613
+#: 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 ""
 
@@ -3202,6 +3258,11 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
+#: setup/setup_ldap.tpl:78
+msgid "Select user"
+msgstr ""
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr ""
@@ -3272,42 +3333,42 @@ msgstr ""
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1003
+#: plugins/admin/groups/class_group.inc:994
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/class_group.inc:1117
-#: plugins/admin/groups/class_group.inc:1196
-#: plugins/personal/posix/class_posixAccount.inc:1045
-#: plugins/personal/posix/class_posixAccount.inc:1048
-#: plugins/personal/posix/generic.tpl:74
+#: 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_group.inc:1184
+#: plugins/admin/groups/class_group.inc:1175
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1198
+#: plugins/admin/groups/class_group.inc:1189
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1199
+#: plugins/admin/groups/class_group.inc:1190
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1201
+#: plugins/admin/groups/class_group.inc:1192
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1202
+#: plugins/admin/groups/class_group.inc:1193
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1204
+#: plugins/admin/groups/class_group.inc:1195
 msgid "Group member"
 msgstr ""
 
@@ -3326,19 +3387,19 @@ msgid "Edit posix properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:764
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:768
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:773
+#: plugins/admin/users/class_userManagement.inc:784
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr ""
@@ -3354,7 +3415,7 @@ msgid "Edit start menu properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:776
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr ""
@@ -3366,6 +3427,18 @@ msgid ""
 "no way for GOsa to get your data back."
 msgstr ""
 
+#: plugins/admin/users/user-filter.xml:13
+msgid "Default filter"
+msgstr ""
+
+#: plugins/admin/users/user-filter.xml:33
+msgid "Show POSIX users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.xml:53
+msgid "Show mail users"
+msgstr ""
+
 #: plugins/admin/users/password.tpl:4
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3389,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 ""
 
@@ -3407,19 +3480,19 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:409
+#: 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:49
-#: plugins/personal/generic/paste_generic.tpl:7
+#: 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 ""
 
@@ -3431,50 +3504,50 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:667
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:668
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:741
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:732
+#: plugins/admin/users/class_userManagement.inc:743
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/admin/users/class_userManagement.inc:756
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:748
-#: plugins/personal/posix/class_posixAccount.inc:304
-#: plugins/personal/posix/class_posixAccount.inc:324
-#: plugins/personal/posix/class_posixAccount.inc:326
-#: plugins/personal/posix/class_posixAccount.inc:329
+#: 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:749
+#: plugins/admin/users/class_userManagement.inc:760
 msgid "Edit POSIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:760
+#: plugins/admin/users/class_userManagement.inc:771
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:769
+#: plugins/admin/users/class_userManagement.inc:780
 msgid "Edit FAX properties"
 msgstr ""
 
@@ -3510,26 +3583,6 @@ msgstr ""
 msgid "Remove user"
 msgstr ""
 
-#: plugins/admin/users/user-filter.tpl:11
-msgid "Show templates"
-msgstr ""
-
-#: plugins/admin/users/user-filter.tpl:12
-msgid "Show functional users"
-msgstr ""
-
-#: plugins/admin/users/user-filter.tpl:13
-msgid "Show POSIX users"
-msgstr ""
-
-#: plugins/admin/users/user-filter.tpl:14
-msgid "Show Mail users"
-msgstr ""
-
-#: plugins/admin/users/user-filter.tpl:15
-msgid "Show Samba users"
-msgstr ""
-
 #: plugins/admin/users/templatize.tpl:2
 msgid "Applying a template"
 msgstr ""
@@ -3540,7 +3593,7 @@ msgid ""
 "defined in the template."
 msgstr ""
 
-#: plugins/admin/users/templatize.tpl:33
+#: plugins/admin/users/templatize.tpl:32
 msgid "No templates available!"
 msgstr ""
 
@@ -3564,7 +3617,7 @@ msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
+#: plugins/admin/departments/class_departmentManagement.inc:189
 msgid "Domain"
 msgstr ""
 
@@ -3575,29 +3628,27 @@ msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:31
 #: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
+#: 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/dep-list.xml:39
 #: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
+#: 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/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1628
-#: plugins/personal/generic/generic.tpl:280
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
+#: 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 ""
 
@@ -3619,27 +3670,45 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/locality.tpl:44
-#: plugins/admin/departments/generic.tpl:108
-#: plugins/admin/departments/class_domain.inc:89
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:44
-#: plugins/admin/departments/country.tpl:44
-#: plugins/admin/departments/dcObject.tpl:44
-#: plugins/admin/departments/class_department.inc:615
-#: plugins/admin/departments/organization.tpl:108
+#: 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:46
-#: plugins/admin/departments/generic.tpl:110
-#: plugins/admin/departments/domain.tpl:46
-#: plugins/admin/departments/country.tpl:46
-#: plugins/admin/departments/dcObject.tpl:46
-#: plugins/admin/departments/organization.tpl:110
+#: 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 ""
 
@@ -3655,101 +3724,88 @@ msgstr ""
 msgid "Descriptive text for   department"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:606
-#: plugins/admin/departments/organization.tpl:27
-msgid "Category"
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/generic.tpl:67
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/organization.tpl:55
-#: plugins/admin/departments/organization.tpl:67
-#: plugins/personal/generic/class_user.inc:1641
-#: plugins/personal/generic/generic.tpl:382
-#: plugins/personal/generic/multiple_generic.tpl:265
+#: 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:59
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:609
-#: plugins/admin/departments/organization.tpl:59
-#: plugins/personal/generic/class_user.inc:1640
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/multiple_generic.tpl:275
+#: 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:62
-#: plugins/admin/departments/organization.tpl:62
+#: 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:70
-#: plugins/admin/departments/organization.tpl:70
+#: plugins/admin/departments/generic.tpl:94
+#: plugins/admin/departments/organization.tpl:93
 msgid "Location of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:75
-#: plugins/admin/departments/class_department.inc:611
-#: plugins/admin/departments/organization.tpl:75
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/multiple_generic.tpl:67
-#: plugins/personal/generic/multiple_generic.tpl:285
+#: 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:78
-#: plugins/admin/departments/organization.tpl:78
+#: plugins/admin/departments/generic.tpl:102
+#: plugins/admin/departments/organization.tpl:101
 msgid "Postal address of this subtree"
 msgstr ""
 
-#: plugins/admin/departments/generic.tpl:85
-#: plugins/admin/departments/organization.tpl:85
+#: 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:90
-#: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:312
-#: plugins/admin/departments/class_department.inc:613
-#: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1742
-#: plugins/personal/generic/generic.tpl:364
-#: plugins/personal/generic/generic.tpl:532
-#: plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
+#: 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:93
-#: plugins/admin/departments/organization.tpl:93
+#: 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_domain.inc:77
-#: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:189
-#: plugins/admin/departments/class_dcObject.inc:77
-#: plugins/admin/departments/class_dcObject.inc:78
+#: 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_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:596
-#: plugins/admin/departments/class_department.inc:601
+#: plugins/admin/departments/class_department.inc:654
+#: plugins/admin/departments/class_department.inc:659
 msgid "Departments"
 msgstr ""
 
@@ -3757,27 +3813,28 @@ msgstr ""
 msgid "Manage Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:128
+#: plugins/admin/departments/class_departmentManagement.inc:122
 msgid ""
 "As soon as the tag operation has finished, you can scroll down to end of the "
 "page and    press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:122
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1642
+#: 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_organizationGeneric.inc:126
+#: plugins/admin/departments/class_organizationGeneric.inc:132
 msgid "Phone number"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:87
+#: plugins/admin/departments/class_countryGeneric.inc:91
 #: plugins/admin/departments/country.tpl:11
 msgid "Country name"
 msgstr ""
@@ -3794,44 +3851,44 @@ msgstr ""
 msgid "Name of country to create"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:372
+#: plugins/admin/departments/class_department.inc:433
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:443
+#: plugins/admin/departments/class_department.inc:501
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:524
+#: plugins/admin/departments/class_department.inc:582
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:565
+#: plugins/admin/departments/class_department.inc:623
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:604
+#: plugins/admin/departments/class_department.inc:662
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:612
+#: plugins/admin/departments/class_department.inc:670
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:725
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:732
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:705
+#: plugins/admin/departments/class_department.inc:764
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -3933,9 +3990,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1598
-#: plugins/personal/generic/generic.tpl:449
-#: plugins/personal/generic/multiple_generic.tpl:345
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/generic/generic.tpl:509
 msgid "Role"
 msgstr ""
 
@@ -3969,312 +4025,301 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:279
+#: 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:294
+#: plugins/personal/generic/class_user.inc:340
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:294
+#: plugins/personal/generic/class_user.inc:340
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:382
+#: 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:477
+#: plugins/personal/generic/class_user.inc:522
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:522
+#: 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:532
+#: 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:535
+#: plugins/personal/generic/class_user.inc:582
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:536
+#: plugins/personal/generic/class_user.inc:583
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:588
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:567
+#: plugins/personal/generic/class_user.inc:614
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1205
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1212
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1230
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1239
+#: plugins/personal/generic/class_user.inc:1301
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/class_user.inc:1646
-#: plugins/personal/generic/class_user.inc:1736
-#: plugins/personal/generic/generic.tpl:199
-#: 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:1315
-#: plugins/personal/generic/class_user.inc:1745
-#: plugins/personal/generic/generic.tpl:348
-#: 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:1318
-#: plugins/personal/generic/class_user.inc:1748
-#: plugins/personal/generic/generic.tpl:356
-#: 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:1323
-#: plugins/personal/generic/class_user.inc:1619
-#: plugins/personal/generic/generic.tpl:119
+#: 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:1433
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:472
-#: 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:1588
-#: plugins/personal/generic/generic.tpl:497
-#: 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:1589
-#: plugins/personal/generic/generic.tpl:414
-#: 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:1590
-#: plugins/personal/generic/generic.tpl:541
-#: 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:1591
-#: plugins/personal/generic/generic.tpl:463
-#: 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:1592
-#: plugins/personal/generic/generic.tpl:422
-#: 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:1593
-#: plugins/personal/generic/generic.tpl:431
-#: 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:1594
-#: plugins/personal/generic/generic.tpl:440
-#: 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:1595
-#: 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:1596
-#: plugins/personal/generic/generic.tpl:550
-#: plugins/personal/generic/multiple_generic.tpl:460
-msgid "Public visible"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1597
-#: plugins/personal/generic/generic.tpl:481
-#: 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:1599
-#: plugins/personal/generic/generic.tpl:489
-#: 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:1603
+#: plugins/personal/generic/class_user.inc:1670
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1607
-#: plugins/personal/posix/class_posixAccount.inc:1444
+#: 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:1615
+#: plugins/personal/generic/class_user.inc:1682
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1616
-#: 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:1617
-#: 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:1620
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:143
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
-#: plugins/personal/generic/paste_generic.tpl:47
-msgid "User picture"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1626
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Login restrictions"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1699
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/generic.tpl:312
-#: 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:1634
+#: plugins/personal/generic/class_user.inc:1702
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1636
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1705
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1706
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1712
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/class_user.inc:1713
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/class_user.inc:1715
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1648
+#: 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
+#: 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:86
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/multiple_generic.tpl:33
+#: plugins/personal/generic/generic.tpl:157
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:191
-#: plugins/personal/generic/multiple_generic.tpl:78
+#: plugins/personal/generic/generic.tpl:197
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:212
-#: plugins/personal/generic/multiple_generic.tpl:105
+#: plugins/personal/generic/generic.tpl:213
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:229
-#: plugins/personal/generic/multiple_generic.tpl:117
-#: plugins/personal/generic/generic_certs.tpl:3
-msgid "Certificates"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl:232
-#: plugins/personal/generic/multiple_generic.tpl:121
+#: plugins/personal/generic/generic.tpl:233
 msgid "Edit certificates"
 msgstr ""
 
@@ -4282,67 +4327,67 @@ msgstr ""
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:249
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:273
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:268
-#: 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:296
-#: 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:304
-#: plugins/personal/generic/multiple_generic.tpl:179
+#: plugins/personal/generic/generic.tpl:326
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:512
-#: plugins/personal/generic/multiple_generic.tpl:207
-#: plugins/personal/generic/multiple_generic.tpl:418
+#: plugins/personal/generic/generic.tpl:390
+#: plugins/personal/generic/generic.tpl:572
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:526
+#: plugins/personal/generic/generic.tpl:586
 msgid "Please use the phone tab"
 msgstr ""
 
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr ""
 
-#: 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
@@ -4352,18 +4397,38 @@ 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 ""
@@ -4394,225 +4459,224 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:444
+#: 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:448
+#: plugins/personal/posix/class_posixAccount.inc:433
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:452
+#: 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:456
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:779
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:851
-#: plugins/personal/posix/class_posixAccount.inc:1169
+#: 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:946
+#: 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:1027
-#: plugins/personal/posix/class_posixAccount.inc:1030
-#: plugins/personal/posix/class_posixAccount.inc:1105
-#: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1450
-#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/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:1038
-#: plugins/personal/posix/class_posixAccount.inc:1041
-#: plugins/personal/posix/generic.tpl:63
+#: 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:1061
-#: plugins/personal/posix/class_posixAccount.inc:1114
+#: plugins/personal/posix/class_posixAccount.inc:1047
+#: plugins/personal/posix/class_posixAccount.inc:1100
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1066
-#: plugins/personal/posix/class_posixAccount.inc:1119
+#: plugins/personal/posix/class_posixAccount.inc:1052
+#: plugins/personal/posix/class_posixAccount.inc:1105
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1071
-#: plugins/personal/posix/class_posixAccount.inc:1124
+#: plugins/personal/posix/class_posixAccount.inc:1057
+#: plugins/personal/posix/class_posixAccount.inc:1110
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1085
-#: plugins/personal/posix/class_posixAccount.inc:1138
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1440
+#: plugins/personal/posix/class_posixAccount.inc:1426
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
-#: 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:1452
+#: plugins/personal/posix/class_posixAccount.inc:1438
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1453
+#: plugins/personal/posix/class_posixAccount.inc:1439
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1455
+#: plugins/personal/posix/class_posixAccount.inc:1441
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1456
+#: plugins/personal/posix/class_posixAccount.inc:1442
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1457
+#: plugins/personal/posix/class_posixAccount.inc:1443
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1458
+#: plugins/personal/posix/class_posixAccount.inc:1444
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1459
+#: plugins/personal/posix/class_posixAccount.inc:1445
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1460
+#: plugins/personal/posix/class_posixAccount.inc:1446
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1447
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: 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:41
+#: plugins/personal/posix/generic.tpl:42
 msgid "Last logon"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:59
+#: plugins/personal/posix/generic.tpl:60
 #: plugins/personal/posix/paste_generic.tpl:31
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:89
-#: 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:91
-#: 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:100
+#: plugins/personal/posix/generic.tpl:102
 msgid "Common group"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/generic.tpl:106
 msgid "Groups differ"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:127
-msgid "SSH keys"
+#: plugins/personal/posix/generic.tpl:126
+msgid "Account permissions"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:128
-msgid "Edit public ssh keys..."
+#: plugins/personal/posix/generic.tpl:131
+msgid "SSH keys"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:132
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:32
-msgid "Display groups of department"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:44
-msgid "Display groups matching"
-msgstr ""
-
-#: plugins/personal/posix/posix_groups.tpl:48
-msgid "Regular expression for matching group names"
+msgid "Edit public ssh keys..."
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:55
-msgid "Display groups of user"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show servers"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
-msgid "Show servers"
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:14
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
-msgid "Show workstations"
+#: plugins/personal/posix/trustSelect/trust-list.tpl:4
+msgid "List of systems"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
-msgid "Show terminals"
+#: 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 ""
 
@@ -4672,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 ""
@@ -5396,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 ""
@@ -5585,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 ""