Fixed typo

[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 41b7f1e32f03c27282d3bd900a910fb76f0233f8..33ed55c8bc8deca0c486db3bcd44b855e5de95d1 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: 2008-03-08 18:38+0100\n"
+"POT-Creation-Date: 2008-03-18 21:43+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"
@@ -406,37 +406,38 @@ msgid ""
 "this by mail."
 msgstr ""
 
-#: setup/setup_feedback.tpl:14 plugins/personal/generic/class_user.inc:1451
+#: setup/setup_feedback.tpl:14 plugins/personal/generic/class_user.inc:1462
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: plugins/personal/generic/generic.tpl:271 html/getxls.php:301
 msgid "Organization"
 msgstr ""
 
 #: setup/setup_feedback.tpl:22 setup/setup_migrate.tpl:209
-#: plugins/personal/generic/class_user.inc:1133
 #: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1567
-#: plugins/admin/users/class_userManagement.inc:736
-#: plugins/admin/users/class_userManagement.inc:814
-#: plugins/admin/users/class_userManagement.inc:826
-#: plugins/admin/groups/class_groupGeneric.inc:871
-#: plugins/admin/groups/class_groupGeneric.inc:877
-#: plugins/admin/groups/class_groupGeneric.inc:879
-#: plugins/admin/groups/class_groupGeneric.inc:891
-#: plugins/admin/groups/class_groupGeneric.inc:905
-#: plugins/admin/groups/class_groupGeneric.inc:912
-#: plugins/admin/groups/class_groupGeneric.inc:1023
+#: plugins/personal/generic/class_user.inc:1155
+#: plugins/personal/generic/class_user.inc:1192
+#: plugins/personal/generic/class_user.inc:1578
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/users/class_userManagement.inc:809
+#: plugins/admin/users/class_userManagement.inc:821
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/groups/class_groupGeneric.inc:876
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/groups/class_groupGeneric.inc:890
+#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:911
+#: plugins/admin/groups/class_groupGeneric.inc:1022
+#: plugins/admin/groups/class_divListGroup.inc:79
 #: plugins/admin/acl/acl_role.tpl:7 plugins/admin/acl/paste_role.tpl:4
 #: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/departments/class_departmentGeneric.inc:250
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
+#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
-#: plugins/admin/departments/class_departmentGeneric.inc:266
-#: plugins/admin/departments/class_departmentGeneric.inc:270
-#: plugins/admin/ogroups/class_ogroup.inc:614
-#: plugins/admin/ogroups/class_ogroup.inc:624
-#: plugins/admin/ogroups/class_ogroup.inc:771 html/getxls.php:225
+#: plugins/admin/ogroups/class_ogroup.inc:659
+#: plugins/admin/ogroups/class_ogroup.inc:669
+#: plugins/admin/ogroups/class_ogroup.inc:816 html/getxls.php:225
 #: html/getxls.php:292
 msgid "Name"
 msgstr ""
@@ -456,11 +457,11 @@ msgid ""
 msgstr ""
 
 #: setup/setup_feedback.tpl:46 plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1431
+#: plugins/personal/generic/class_user.inc:1442
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/admin/groups/class_groupGeneric.inc:1014
-#: plugins/admin/departments/class_departmentGeneric.inc:568
-#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/groups/class_groupGeneric.inc:1013
+#: plugins/admin/departments/class_departmentGeneric.inc:527
+#: plugins/admin/ogroups/class_ogroup.inc:807
 #: plugins/generic/references/class_reference.inc:40
 msgid "Generic"
 msgstr ""
@@ -534,11 +535,11 @@ msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
 #: setup/class_setupStep_Config3.inc:193
-msgid "Session lifetime must be a numeric value."
+msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
 #: setup/class_setupStep_Config3.inc:197
-msgid "Maximal ldap query time must be a numeric value. "
+msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
 #: setup/class_setupStep_Feedback.inc:91
@@ -621,7 +622,7 @@ msgstr ""
 msgid "Samba hash generator"
 msgstr ""
 
-#: setup/setup_config2.tpl:15 plugins/admin/groups/class_groupGeneric.inc:1034
+#: setup/setup_config2.tpl:15 plugins/admin/groups/class_groupGeneric.inc:1033
 msgid "Samba SID"
 msgstr ""
 
@@ -715,14 +716,14 @@ msgid "Snapshot base"
 msgstr ""
 
 #: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/admin/ogroups/class_ogroupManagement.inc:502
 #: plugins/generic/references/class_reference.inc:64
 msgid "Server"
 msgstr ""
 
 #: setup/setup_config2.tpl:273 setup/setup_config2.tpl:318
-#: plugins/admin/users/class_divListUsers.inc:176
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
+#: plugins/admin/users/class_divListUsers.inc:175
+#: plugins/admin/ogroups/class_ogroupManagement.inc:498
 msgid "User"
 msgstr ""
 
@@ -775,11 +776,11 @@ msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:161
-msgid "Checking for duplicate uid numbers"
+msgid "Checking for duplicated UID numbers"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:167
-msgid "Checking for duplicate gid numbers"
+msgid "Checking for duplicate GID numbers"
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:190 setup/class_setupStep_Migrate.inc:239
@@ -805,9 +806,12 @@ msgstr ""
 #: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 include/class_tabs.inc:216
-#: include/functions.inc:699 include/functions.inc:2212
-#: include/functions.inc:2216 include/functions.inc:2222
-#: plugins/personal/posix/class_posixAccount.inc:820
+#: include/functions.inc:699 include/functions.inc:2170
+#: include/functions.inc:2174 include/functions.inc:2180
+#: plugins/personal/posix/class_posixAccount.inc:817
+#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/admin/users/class_userManagement.inc:489
+#: plugins/admin/users/class_userManagement.inc:603
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/acl/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
@@ -831,12 +835,7 @@ msgstr ""
 #: setup/setup_checks.tpl:87 ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:131
-#: ihtml/themes/default/msg_dialog.tpl:133 include/utils/class_msgPool.inc:238
-#: plugins/personal/generic/main.inc:160
-#: plugins/admin/users/class_userManagement.inc:922
-#: plugins/admin/groups/class_groupManagement.inc:520
-#: plugins/admin/acl/tabs_acl_role.inc:67 plugins/admin/acl/tabs_acl.inc:81
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: ihtml/themes/default/msg_dialog.tpl:133 include/utils/class_msgPool.inc:314
 #, php-format
 msgid "Ok"
 msgstr ""
@@ -909,11 +908,11 @@ msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:883
-#: plugins/admin/users/class_divListUsers.inc:171
-#: plugins/admin/groups/class_divListGroup.inc:179
-#: plugins/admin/acl/class_divListACL.inc:162
-#: plugins/admin/departments/class_divListDepartment.inc:152
-#: plugins/admin/ogroups/class_divListOGroup.inc:191
+#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/groups/class_divListGroup.inc:183
+#: plugins/admin/acl/class_divListACL.inc:161
+#: plugins/admin/departments/class_divListDepartment.inc:151
+#: plugins/admin/ogroups/class_divListOGroup.inc:201
 msgid "Create"
 msgstr ""
 
@@ -940,26 +939,35 @@ msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:1019 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 include/utils/class_msgPool.inc:105
-#: include/utils/class_msgPool.inc:117 include/utils/class_msgPool.inc:135
-#: include/utils/class_msgPool.inc:382 include/class_gosaSupportDaemon.inc:745
-#: include/class_gosaSupportDaemon.inc:765
+#: ihtml/themes/default/msg_dialog.tpl:100 include/utils/class_msgPool.inc:153
+#: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
+#: include/utils/class_msgPool.inc:464 include/utils/class_msgPool.inc:483
+#: include/class_gosaSupportDaemon.inc:867
+#: include/class_gosaSupportDaemon.inc:887
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:126
+#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:183
+#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:268
 #: include/class_CopyPasteHandler.inc:350 include/class_plugin.inc:626
 #: include/class_plugin.inc:658 include/class_plugin.inc:689
 #: include/class_plugin.inc:1404 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
-#: include/class_log.inc:180 include/class_log.inc:218
-#: include/class_log.inc:241 include/class_msg_dialog.inc:97
-#: include/functions.inc:1264 plugins/personal/generic/class_user.inc:395
-#: plugins/personal/generic/class_user.inc:492
-#: plugins/personal/generic/class_user.inc:755
-#: plugins/personal/generic/class_user.inc:1285
+#: include/class_log.inc:177 include/class_log.inc:192
+#: include/class_log.inc:205 include/class_log.inc:228
+#: include/class_msg_dialog.inc:97 plugins/personal/generic/class_user.inc:395
+#: plugins/personal/generic/class_user.inc:496
+#: plugins/personal/generic/class_user.inc:766
+#: plugins/personal/generic/class_user.inc:1296
 #: plugins/personal/generic/main.inc:104
-#: plugins/personal/posix/class_posixAccount.inc:1321
-#: plugins/admin/groups/class_groupGeneric.inc:728
-#: plugins/admin/groups/class_groupGeneric.inc:733
-#: plugins/admin/groups/class_groupGeneric.inc:966 html/index.php:225
+#: plugins/personal/posix/class_posixAccount.inc:1319
+#: plugins/admin/groups/class_groupGeneric.inc:727
+#: plugins/admin/groups/class_groupGeneric.inc:732
+#: plugins/admin/groups/class_groupGeneric.inc:965 html/index.php:225
 #: html/index.php:229
+#, php-format
 msgid "Error"
 msgstr ""
 
@@ -980,26 +988,26 @@ msgstr ""
 #: include/class_acl.inc:1082 include/class_MultiSelectWindow.inc:529
 #: include/class_config.inc:228 include/functions.inc:344
 #: include/functions.inc:371 include/functions.inc:380
-#: include/functions.inc:409 include/functions.inc:652
-#: include/functions.inc:691 include/functions.inc:736
-#: include/functions.inc:2544 include/class_ldap.inc:636
-#: include/class_ldap.inc:1102 plugins/personal/generic/class_user.inc:671
-#: plugins/personal/generic/class_user.inc:1009
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2502
+#: include/class_ldap.inc:648 include/class_ldap.inc:1114
+#: plugins/personal/generic/class_user.inc:682
+#: plugins/personal/generic/class_user.inc:1020
 #: plugins/personal/posix/class_posixAccount.inc:663
-#: plugins/personal/posix/class_posixAccount.inc:929
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/class_groupGeneric.inc:577
-#: plugins/admin/groups/class_groupGeneric.inc:844
+#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/admin/users/class_userManagement.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:576
+#: plugins/admin/groups/class_groupGeneric.inc:843
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/departments/class_departmentGeneric.inc:190
-#: plugins/admin/departments/class_departmentGeneric.inc:365
-#: plugins/admin/departments/class_departmentGeneric.inc:660
-#: plugins/admin/departments/class_departmentGeneric.inc:691
-#: plugins/admin/departments/tabs_department.inc:54
-#: plugins/admin/ogroups/class_ogroup.inc:686
-#: plugins/admin/ogroups/class_ogroup.inc:700 html/index.php:255
+#: plugins/admin/departments/class_departmentGeneric.inc:186
+#: plugins/admin/departments/class_departmentGeneric.inc:351
+#: plugins/admin/departments/class_departmentGeneric.inc:619
+#: plugins/admin/departments/class_departmentGeneric.inc:650
+#: plugins/admin/ogroups/class_ogroup.inc:731
+#: plugins/admin/ogroups/class_ogroup.inc:745 html/index.php:255
 #: html/index.php:269 html/index.php:282
 msgid "LDAP error"
 msgstr ""
@@ -1197,12 +1205,7 @@ msgstr ""
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
 #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
 #: ihtml/themes/default/acl.tpl:75 ihtml/themes/default/acl.tpl:89
-#: include/utils/class_msgPool.inc:244
-#: plugins/admin/users/class_userManagement.inc:925
-#: plugins/admin/groups/class_groupManagement.inc:523
-#: plugins/admin/acl/acl_role.tpl:49 plugins/admin/acl/acl_role.tpl:59
-#: plugins/admin/acl/acl_role.tpl:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:456
+#: include/utils/class_msgPool.inc:320
 #, php-format
 msgid "Apply"
 msgstr ""
@@ -1216,29 +1219,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:89 ihtml/themes/default/acl.tpl:77
 #: ihtml/themes/default/acl.tpl:91 ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/msg_dialog.tpl:79
-#: ihtml/themes/default/msg_dialog.tpl:134 include/utils/class_msgPool.inc:232
-#: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/generic_certs.tpl:94
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/main.inc:162
-#: plugins/personal/posix/posix_groups.tpl:81
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/admin/users/template.tpl:50 plugins/admin/users/password.tpl:32
-#: plugins/admin/users/class_userManagement.inc:928
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/remove.tpl:19
-#: plugins/admin/groups/group_objects.tpl:57
-#: plugins/admin/groups/class_groupManagement.inc:526
-#: plugins/admin/groups/remove.tpl:18 plugins/admin/groups/remove.tpl:22
-#: plugins/admin/acl/acl_role.tpl:61 plugins/admin/acl/acl_role.tpl:75
-#: plugins/admin/acl/tabs_acl_role.inc:69 plugins/admin/acl/tabs_acl.inc:83
-#: plugins/admin/acl/remove.tpl:17 plugins/admin/acl/remove.tpl:21
-#: plugins/admin/departments/dep_move_confirm.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:406
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/remove.tpl:21
-#: plugins/admin/ogroups/class_ogroupManagement.inc:459
-#: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/remove.tpl:17 plugins/admin/ogroups/remove.tpl:21
+#: ihtml/themes/default/msg_dialog.tpl:134 include/utils/class_msgPool.inc:308
 #, php-format
 msgid "Cancel"
 msgstr ""
@@ -1259,20 +1240,20 @@ msgstr ""
 msgid "TLS connection"
 msgstr ""
 
-#: setup/setup_ldap.tpl:55 plugins/personal/generic/class_user.inc:1441
+#: setup/setup_ldap.tpl:55 plugins/personal/generic/class_user.inc:1452
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/personal/generic/generic.tpl:170
-#: plugins/admin/users/class_divListUsers.inc:163
-#: plugins/admin/groups/class_groupGeneric.inc:1024
-#: plugins/admin/groups/class_divListGroup.inc:171
+#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/groups/class_groupGeneric.inc:1023
+#: plugins/admin/groups/class_divListGroup.inc:175
 #: plugins/admin/groups/generic.tpl:39 plugins/admin/acl/acl_role.tpl:27
-#: plugins/admin/acl/class_divListACL.inc:154
+#: plugins/admin/acl/class_divListACL.inc:153
 #: plugins/admin/acl/class_aclRole.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#: plugins/admin/departments/class_divListDepartment.inc:145
+#: plugins/admin/departments/class_departmentGeneric.inc:538
+#: plugins/admin/departments/class_divListDepartment.inc:144
 #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/ogroups/class_ogroup.inc:772
-#: plugins/admin/ogroups/class_divListOGroup.inc:183
+#: plugins/admin/ogroups/class_ogroup.inc:817
+#: plugins/admin/ogroups/class_divListOGroup.inc:193
 #: plugins/admin/ogroups/generic.tpl:26
 msgid "Base"
 msgstr ""
@@ -1313,10 +1294,11 @@ msgstr ""
 msgid "Current status"
 msgstr ""
 
-#: setup/setup_ldap.tpl:121 ihtml/themes/default/MultiSelectWindow.tpl:44
-#: ihtml/themes/default/MultiSelectWindow.tpl:84
+#: setup/setup_ldap.tpl:121 ihtml/themes/default/MultiSelectWindow.tpl:45
+#: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:104
+#: plugins/admin/users/class_userManagement.inc:598
 #: plugins/admin/ogroups/class_ogroup.inc:169
 msgid "Information"
 msgstr ""
@@ -1441,7 +1423,7 @@ msgid ""
 msgstr ""
 
 #: setup/setup_migrate.tpl:217
-#: plugins/personal/posix/class_posixAccount.inc:1508 html/getxls.php:102
+#: plugins/personal/posix/class_posixAccount.inc:1506 html/getxls.php:102
 #: html/getxls.php:137 html/getxls.php:160 html/getxls.php:349
 #: html/getxls.php:366
 msgid "User ID"
@@ -1547,26 +1529,26 @@ msgstr ""
 
 #: setup/class_setupStep_Ldap.inc:105
 #, php-format
-msgid "Anonymous bind failed on server '%s'."
+msgid "Anonymous bind to server '%s' failed!"
 msgstr ""
 
 #: setup/class_setupStep_Ldap.inc:107
 #, php-format
-msgid "Bind as user '%s' failed on server '%s'."
+msgid "Bind as user '%s' failed!"
 msgstr ""
 
 #: setup/class_setupStep_Ldap.inc:112
 #, php-format
-msgid "Anonymous bind on server '%s' succeeded."
+msgid "Anonymous bind to server '%s' succeeded."
 msgstr ""
 
 #: setup/class_setupStep_Ldap.inc:113
-msgid "Please specify user and password."
+msgid "Please specify user and password!"
 msgstr ""
 
 #: setup/class_setupStep_Ldap.inc:115
 #, php-format
-msgid "Bind as user '%s' on server '%s' succeeded."
+msgid "Bind as user '%s' to server '%s' succeeded!"
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:40 setup/class_setupStep_Language.inc:41
@@ -1585,18 +1567,10 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:261 setup/class_setup.inc:263
-#: include/functions.inc:1550 plugins/personal/generic/main.inc:170
-#: plugins/personal/password/changed.tpl:9
-#: plugins/admin/departments/dep_iframe.tpl:18
-#: plugins/admin/departments/class_departmentManagement.inc:441
-msgid "Back"
-msgstr ""
-
 #: setup/class_setup.inc:266 ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:459
-#: plugins/admin/departments/class_departmentGeneric.inc:554
+#: plugins/admin/departments/class_departmentGeneric.inc:434
+#: plugins/admin/departments/class_departmentGeneric.inc:514
 msgid "Continue"
 msgstr ""
 
@@ -1641,7 +1615,7 @@ msgid "Relaxed naming policies"
 msgstr ""
 
 #: setup/setup_config1.tpl:81
-msgid "Automatic uids"
+msgid "Automatic UIDs"
 msgstr ""
 
 #: setup/setup_config1.tpl:97 setup/class_setupStep_Config1.inc:118
@@ -1849,8 +1823,8 @@ msgid ""
 "reason, why GOsa can't read your schema configuration!"
 msgstr ""
 
-#: ihtml/themes/default/MultiSelectWindow.tpl:55
-#: ihtml/themes/default/MultiSelectWindow.tpl:95
+#: ihtml/themes/default/MultiSelectWindow.tpl:57
+#: ihtml/themes/default/MultiSelectWindow.tpl:97
 #: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/admin/groups/group_objects.tpl:20
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
@@ -1873,7 +1847,7 @@ msgstr ""
 
 #: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:44
 #: ihtml/themes/default/password.tpl:68 ihtml/themes/default/password.tpl:70
-#: plugins/admin/users/class_divListUsers.inc:81
+#: plugins/admin/users/class_divListUsers.inc:80
 msgid "Username"
 msgstr ""
 
@@ -1952,11 +1926,7 @@ msgstr ""
 
 #: ihtml/themes/default/pwd_heimdal.tpl:198
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/utils/class_msgPool.inc:250 include/class_MultiSelectWindow.inc:134
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/generic_certs.tpl:91
-#: plugins/admin/departments/dep_move_confirm.tpl:15
-#: plugins/admin/departments/class_departmentManagement.inc:404
+#: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #, php-format
 msgid "Save"
 msgstr ""
@@ -1973,30 +1943,39 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:15
-msgid "Your Password has expired !! Choose a new Password"
+msgid "Your password has expired. Please choose a new one!"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:23
 #: ihtml/themes/default/accountexpired.tpl:27
-msgid "Old Password"
+msgid "Old password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
-msgid "New Password"
+#: ihtml/themes/default/password.tpl:81 ihtml/themes/default/password.tpl:82
+#: plugins/personal/generic/password.tpl:7
+#: plugins/personal/generic/main.inc:86
+#: plugins/personal/password/password.tpl:18
+#: plugins/admin/users/password.tpl:13
+#: plugins/admin/users/class_userManagement.inc:252 html/password.php:200
+msgid "New password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:41
 #: ihtml/themes/default/accountexpired.tpl:45
-msgid "Verify Password"
+msgid "Verify password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
-msgid "Change Password"
+#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:339
+msgid "Change password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:52
-msgid "Click here to Change your password"
+#: ihtml/themes/default/password.tpl:101
+msgid "Click here to change your password"
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl:2
@@ -2056,10 +2035,10 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
-#: include/utils/class_msgPool.inc:379 include/class_acl.inc:663
+#: include/utils/class_msgPool.inc:461 include/class_acl.inc:663
 #: include/class_acl.inc:670 include/class_acl.inc:677
 #: include/class_acl.inc:683
-#: plugins/admin/departments/class_departmentGeneric.inc:532
+#: plugins/admin/departments/class_departmentGeneric.inc:492
 msgid "Object"
 msgstr ""
 
@@ -2097,7 +2076,7 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:2 plugins/admin/acl/acl_role.tpl:3
-msgid "Assigned ACLs for current entry"
+msgid "Assigned ACL for current entry"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:4 plugins/admin/acl/acl_role.tpl:44
@@ -2124,7 +2103,8 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:41 html/getxls.php:123 html/getxls.php:286
+#: ihtml/themes/default/acl.tpl:41 include/class_acl.inc:948
+#: html/getxls.php:123 html/getxls.php:286
 msgid "Members"
 msgstr ""
 
@@ -2137,7 +2117,7 @@ msgid "List of available ACL categories"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:63
-msgid "ACLs for this object"
+msgid "ACL for this object"
 msgstr ""
 
 #: ihtml/themes/default/acl.tpl:69
@@ -2157,7 +2137,16 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:40
-#: plugins/admin/users/class_userManagement.inc:348
+#: plugins/personal/password/class_password.inc:79
+#: plugins/personal/password/class_password.inc:82
+#: plugins/personal/password/class_password.inc:85
+#: plugins/personal/password/class_password.inc:88
+#: plugins/personal/password/class_password.inc:91
+#: plugins/personal/password/class_password.inc:94
+#: plugins/personal/password/class_password.inc:108
+#: plugins/personal/password/class_password.inc:114
+#: plugins/admin/users/class_userManagement.inc:299
+#: plugins/admin/users/class_userManagement.inc:354 html/main.php:356
 msgid "Password change"
 msgstr ""
 
@@ -2173,21 +2162,7 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:81 ihtml/themes/default/password.tpl:82
-#: ihtml/themes/default/password.tpl:85
-#: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
-#: plugins/personal/password/password.tpl:18
-#: plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:246 html/password.php:200
-msgid "New password"
-msgstr ""
-
-#: ihtml/themes/default/password.tpl:85
-msgid "again"
-msgstr ""
-
-#: ihtml/themes/default/password.tpl:86
+#: ihtml/themes/default/password.tpl:85 ihtml/themes/default/password.tpl:86
 msgid "New password repeated"
 msgstr ""
 
@@ -2200,10 +2175,6 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:101
-msgid "Click here to change your password"
-msgstr ""
-
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy & paste wizard"
 msgstr ""
@@ -2298,7 +2269,7 @@ msgid ""
 "and let me use filters instead"
 msgstr ""
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:268
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:344
 #: plugins/personal/generic/generic.tpl:137
 #, php-format
 msgid "Set"
@@ -2315,586 +2286,675 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: ihtml/themes/default/remove.tpl:13 include/utils/class_msgPool.inc:262
-#: plugins/personal/posix/paste_generic.tpl:62
-#: plugins/personal/posix/generic.tpl:107
-#: plugins/personal/posix/generic.tpl:149
-#: plugins/personal/posix/generic.tpl:178 plugins/admin/users/remove.tpl:15
-#: plugins/admin/users/remove.tpl:18 plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/remove.tpl:20 plugins/admin/groups/generic.tpl:195
-#: plugins/admin/acl/remove.tpl:15 plugins/admin/acl/remove.tpl:19
-#: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/remove.tpl:19 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/remove.tpl:19 plugins/admin/ogroups/generic.tpl:54
+#: include/class_certificate.inc:73
+msgid "Certificate is empty!"
+msgstr ""
+
+#: include/class_certificate.inc:100
+msgid "Cannot load certificate - only PEM/DER is supported!"
+msgstr ""
+
+#: include/class_certificate.inc:115
+msgid "Cannot extract information for non PEM certificates!"
+msgstr ""
+
+#: include/class_certificate.inc:219
+msgid "No valid certificate loaded!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:15
 #, php-format
-msgid "Delete"
+msgid "Select to list objects of type '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:55
-msgid "Can't open specified file, check accessibility and or existence"
+#: include/utils/class_msgPool.inc:17
+#, php-format
+msgid "Select to list objects containig '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:73
-msgid "Can't read specified certificate / or empty string given"
+#: include/utils/class_msgPool.inc:19
+#, php-format
+msgid "Select to list objects that have '%s' enabled"
 msgstr ""
 
-#: include/class_certificate.inc:100
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: include/utils/class_msgPool.inc:21
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_certificate.inc:115
-msgid "The Format must be PEM, to output certificate informations"
+#: include/utils/class_msgPool.inc:23
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Search in subtrees"
 msgstr ""
 
-#: include/class_certificate.inc:212
-msgid "Can't create/open File"
+#: include/utils/class_msgPool.inc:33
+msgid "This object will be deleted!"
 msgstr ""
 
-#: include/class_certificate.inc:219
-msgid "No valid certificate loaded"
+#: include/utils/class_msgPool.inc:35
+#, php-format
+msgid "This '%s' object will be deleted!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:40
+#, php-format
+msgid "This object will be deleted: %s"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:42
+#, php-format
+msgid "This '%s' object will be deleted: %s"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:47
+msgid "This object will be deleted:"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:49
+#, php-format
+msgid "This '%s' object will be deleted:"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:53
+#, php-format
+msgid "These objects will be deleted: %s"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:55
+#, php-format
+msgid "These '%s' objects will be deleted: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:14
+#: include/utils/class_msgPool.inc:63
 msgid "You have no permission to delete this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:18 include/utils/class_msgPool.inc:23
+#: include/utils/class_msgPool.inc:67 include/utils/class_msgPool.inc:71
 msgid "You have no permission to delete the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:26
+#: include/utils/class_msgPool.inc:74
 msgid "You have no permission to delete these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:33
+#: include/utils/class_msgPool.inc:81
 msgid "You have no permission to create this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:37 include/utils/class_msgPool.inc:41
+#: include/utils/class_msgPool.inc:85 include/utils/class_msgPool.inc:89
 msgid "You have no permission to create the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:44
+#: include/utils/class_msgPool.inc:92
 msgid "You have no permission to create these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:51
+#: include/utils/class_msgPool.inc:99
 msgid "You have no permission to modify this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:55 include/utils/class_msgPool.inc:59
+#: include/utils/class_msgPool.inc:103 include/utils/class_msgPool.inc:107
 msgid "You have no permission to modify the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:62
+#: include/utils/class_msgPool.inc:110
 msgid "You have no permission to modify these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:69
+#: include/utils/class_msgPool.inc:117
 msgid "You have no permission to view this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:73 include/utils/class_msgPool.inc:77
+#: include/utils/class_msgPool.inc:121 include/utils/class_msgPool.inc:125
 msgid "You have no permission to view the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:80
+#: include/utils/class_msgPool.inc:128
 msgid "You have no permission to view these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:87
+#: include/utils/class_msgPool.inc:135
 msgid "You have no permission to move this object!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:91 include/utils/class_msgPool.inc:95
+#: include/utils/class_msgPool.inc:139 include/utils/class_msgPool.inc:143
 msgid "You have no permission to move the object:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:98
+#: include/utils/class_msgPool.inc:146
 msgid "You have no permission to move these objects:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:108 include/utils/class_msgPool.inc:120
-#: include/utils/class_msgPool.inc:138
+#: include/utils/class_msgPool.inc:156 include/utils/class_msgPool.inc:168
+#: include/utils/class_msgPool.inc:186
 msgid "Connection information"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:110
+#: include/utils/class_msgPool.inc:158
 #, php-format
 msgid "Cannot connect to %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:122
+#: include/utils/class_msgPool.inc:170
 #, php-format
 msgid "Cannot select %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:128
+#: include/utils/class_msgPool.inc:176
 #, php-format
 msgid "No %s server defined!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:140
+#: include/utils/class_msgPool.inc:188
 #, php-format
 msgid "Cannot query %s database!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:146
+#: include/utils/class_msgPool.inc:194
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:152
+#: include/utils/class_msgPool.inc:200
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:159
+#: include/utils/class_msgPool.inc:207
+#, php-format
+msgid "'%s' command is invalid!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:209
+#, php-format
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:211
+#, php-format
+msgid "'%s' command for plugin %s is invalid!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:213
+#, php-format
+msgid "'%s' command (%s) is invalid!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:221
+#, php-format
+msgid "Cannot execute '%s' command!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:223
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:225
+#, php-format
+msgid "Cannot execute '%s' command for plugin %s!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:227
+#, php-format
+msgid "Cannot execute '%s' command (%s)!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:235
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:161
+#: include/utils/class_msgPool.inc:237
 #, php-format
 msgid "'%s' must be smaller than %d!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:169
+#: include/utils/class_msgPool.inc:245
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:171
+#: include/utils/class_msgPool.inc:247
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:178
+#: include/utils/class_msgPool.inc:254
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:184
+#: include/utils/class_msgPool.inc:260
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:190
+#: include/utils/class_msgPool.inc:266
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:198
+#: include/utils/class_msgPool.inc:274
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:215 include/utils/class_msgPool.inc:219
+#: include/utils/class_msgPool.inc:291
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:216
+#: include/utils/class_msgPool.inc:292
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:216
+#: include/utils/class_msgPool.inc:292
+#, php-format
+msgid "'%s' are not allowed!"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:295
 #, php-format
-msgid "'%s' are not allowed."
+msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:226
+#: include/utils/class_msgPool.inc:302
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:256
-#: plugins/personal/posix/paste_generic.tpl:61
-#: plugins/personal/posix/posix_groups.tpl:79
-#: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/posix/generic.tpl:146
-#: plugins/personal/posix/generic.tpl:175
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/admin/groups/group_objects.tpl:55
-#: plugins/admin/groups/generic.tpl:193
-#: plugins/admin/ogroups/ogroup_objects.tpl:54
-#: plugins/admin/ogroups/generic.tpl:51
+#: include/utils/class_msgPool.inc:332
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:256
+#: include/utils/class_msgPool.inc:332
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:262
+#: include/utils/class_msgPool.inc:338 include/class_acl.inc:430
+#: include/class_acl.inc:473 plugins/admin/acl/class_aclRole.inc:361
+#: plugins/admin/acl/class_aclRole.inc:406
+#, php-format
+msgid "Delete"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:338
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:268
+#: include/utils/class_msgPool.inc:344
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:350
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:274
+#: include/utils/class_msgPool.inc:350
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:356
+msgid "Back"
+msgstr ""
+
+#: include/utils/class_msgPool.inc:374
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:298
+#: include/utils/class_msgPool.inc:380
 #, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:301 include/utils/class_msgPool.inc:308
+#: include/utils/class_msgPool.inc:383 include/utils/class_msgPool.inc:390
 #, 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:317
+#: include/utils/class_msgPool.inc:399
 #, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:320
+#: include/utils/class_msgPool.inc:402
 #, 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:327
+#: include/utils/class_msgPool.inc:409
 #, php-format
 msgid ""
 "This account has %s features settings. To disable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:335
+#: include/utils/class_msgPool.inc:417
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:341
+#: include/utils/class_msgPool.inc:423
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:347 plugins/personal/generic/main.inc:183
+#: include/utils/class_msgPool.inc:429
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:353
-#: plugins/personal/generic/class_user.inc:286
+#: include/utils/class_msgPool.inc:435
 msgid "January"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:353
-#: plugins/personal/generic/class_user.inc:286
+#: include/utils/class_msgPool.inc:435
 msgid "February"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:353
-#: plugins/personal/generic/class_user.inc:286
+#: include/utils/class_msgPool.inc:435
 msgid "March"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:353
-#: plugins/personal/generic/class_user.inc:286
+#: include/utils/class_msgPool.inc:435
 msgid "April"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:354
-#: plugins/personal/generic/class_user.inc:287
+#: include/utils/class_msgPool.inc:436
 msgid "May"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:354
-#: plugins/personal/generic/class_user.inc:287
+#: include/utils/class_msgPool.inc:436
 msgid "June"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:354
-#: plugins/personal/generic/class_user.inc:287
+#: include/utils/class_msgPool.inc:436
 msgid "July"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:354
-#: plugins/personal/generic/class_user.inc:287
+#: include/utils/class_msgPool.inc:436
 msgid "August"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:354
-#: plugins/personal/generic/class_user.inc:287
+#: include/utils/class_msgPool.inc:436
 msgid "September"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:355
-#: plugins/personal/generic/class_user.inc:288
+#: include/utils/class_msgPool.inc:437
 msgid "October"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:355
-#: plugins/personal/generic/class_user.inc:288
+#: include/utils/class_msgPool.inc:437
 msgid "November"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:355
-#: plugins/personal/generic/class_user.inc:288
+#: include/utils/class_msgPool.inc:437
 msgid "December"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Sunday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Monday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:361
+#: include/utils/class_msgPool.inc:443
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:368
+#: include/utils/class_msgPool.inc:450
 msgid "read operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:368
+#: include/utils/class_msgPool.inc:450
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:368
+#: include/utils/class_msgPool.inc:450
 msgid "modify operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:369
+#: include/utils/class_msgPool.inc:451
 msgid "delete operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:369
+#: include/utils/class_msgPool.inc:451
 msgid "search operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:369
+#: include/utils/class_msgPool.inc:451
 msgid "authentication"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:372
+#: include/utils/class_msgPool.inc:454
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:374
+#: include/utils/class_msgPool.inc:456
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/utils/class_timezone.inc:51
-#: include/password-methods/class_password-methods-ssha.inc:51
-#: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_CopyPasteHandler.inc:119
-#: include/class_CopyPasteHandler.inc:127
-#: include/class_CopyPasteHandler.inc:176
-#: include/class_CopyPasteHandler.inc:184
-#: include/class_CopyPasteHandler.inc:193 include/class_plugin.inc:1159
-#: include/class_plugin.inc:1171 include/class_pluglist.inc:149
-#: include/class_config.inc:560 include/functions.inc:605
-#: include/functions.inc:2563 include/functions.inc:2590
-#: plugins/admin/groups/class_groupGeneric.inc:152
-#: plugins/admin/groups/class_groupGeneric.inc:547 html/index.php:217
-msgid "Configuration error"
+#: include/utils/class_msgPool.inc:471
+msgid "Upload failed!"
 msgstr ""
 
-#: include/utils/class_timezone.inc:51
+#: include/utils/class_msgPool.inc:474
 #, php-format
-msgid ""
-"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
-"correct timezone offset."
+msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:464
-msgid "Could not parse XML."
+#: include/utils/class_msgPool.inc:481
+msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:745
+#: include/utils/class_msgPool.inc:483
 #, php-format
-msgid "Cannot send abort event for entry: %s"
+msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:765
+#: include/utils/class_msgPool.inc:490 include/utils/class_msgPool.inc:493
 #, php-format
-msgid "Cannot remove entry: %s"
+msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_tabs.inc:216
+#: include/utils/class_msgPool.inc:495
 #, php-format
-msgid "Delete process has been canceled by plugin '%s': %s"
+msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_tabs.inc:343 include/class_acl.inc:1114
-#: include/class_acl.inc:1115 include/class_acl.inc:1120
-msgid "ACL"
+#: include/utils/class_msgPool.inc:501
+#, php-format
+msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_tabs.inc:346
-msgid "References"
+#: include/utils/class_msgPool.inc:507
+#, php-format
+msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:69 include/class_hostActionQueue.inc:194
+#: include/utils/class_msgPool.inc:513
 #, php-format
-msgid "Can't locate gotomasses queue file '%s'."
+msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:73
+#: include/utils/class_msgPool.inc:519
 #, php-format
-msgid "Can't read gotomasses queue file '%s'."
+msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:80
+#: include/utils/class_msgPool.inc:525
 #, php-format
-msgid "Can't read gotomasses storage file '%s'."
+msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:143
-msgid "GOsa infrastructure"
+#: include/utils/class_msgPool.inc:531
+#, php-format
+msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:143
-msgid "Cannot read broken entry - skipped!"
+#: include/utils/class_msgPool.inc:537
+#, php-format
+msgid "Choose subtree to place %s in"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:198 include/class_hostActionQueue.inc:207
+#: include/utils/class_msgPool.inc:543
 #, php-format
-msgid "Can't write gotomasses queue file '%s'."
+msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:202
-msgid "The queue file was modified since last reload. Can't save changes."
+#: include/utils/class_timezone.inc:51
+#: include/password-methods/class_password-methods-ssha.inc:51
+#: include/password-methods/class_password-methods-sha.inc:48
+#: include/class_CopyPasteHandler.inc:119
+#: include/class_CopyPasteHandler.inc:127
+#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:184
+#: include/class_CopyPasteHandler.inc:193 include/class_plugin.inc:1159
+#: include/class_plugin.inc:1171 include/class_pluglist.inc:149
+#: include/class_config.inc:109 include/class_config.inc:561
+#: include/functions.inc:605 include/functions.inc:2521
+#: include/functions.inc:2552 plugins/admin/groups/class_groupGeneric.inc:152
+#: plugins/admin/groups/class_groupGeneric.inc:546 html/password.php:78
+#: html/main.php:217 html/index.php:141 html/index.php:217
+msgid "Configuration error"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:277
+#: include/utils/class_timezone.inc:51
 #, php-format
-msgid "Entry with id '%s' not found."
+msgid ""
+"The timezone setting '%s' in your gosa.conf is not valid. Cannot calculate "
+"correct timezone offset."
+msgstr ""
+
+#: include/class_gosaSupportDaemon.inc:587
+msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:287
+#: include/class_gosaSupportDaemon.inc:867
 #, php-format
-msgid "Could not update entry, entry with id '%s' not found."
+msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:298
+#: include/class_gosaSupportDaemon.inc:887
 #, php-format
-msgid "Could not remove entry, entry with id '%s' not found."
+msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_hostActionQueue.inc:372 include/class_hostActionQueue.inc:390
-#: include/class_hostActionQueue.inc:421 include/class_hostActionQueue.inc:456
+#: include/class_tabs.inc:216
 #, php-format
-msgid "Can't set priority for ID '%s'. ID does not exist."
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
+#: include/class_tabs.inc:343 include/class_acl.inc:429
+#: include/class_acl.inc:430 include/class_acl.inc:1114
+#: include/class_acl.inc:1115 include/class_acl.inc:1120
+#: plugins/admin/acl/tabs_acl.inc:28
+#: plugins/admin/acl/class_aclManagement.inc:26
+#: plugins/admin/acl/class_aclManagement.inc:309
+#: plugins/admin/acl/class_divListACL.inc:259
+#: plugins/admin/acl/class_aclRole.inc:360
+#: plugins/admin/acl/class_aclRole.inc:361
+msgid "ACL"
+msgstr ""
+
+#: include/class_tabs.inc:346
+msgid "References"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:126
+#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:183
+#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:268
 #, php-format
-msgid "Cannot cleanup copy & paste queue: setting permissions for '%s' failed!"
+msgid "Copy and paste failed!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:126
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:183
 #, php-format
-msgid "Cannot cleanup copy & paste queue: no write permission inside '%s'!"
+msgid "Cannot set permission for '%s'"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:158
 #, php-format
-msgid "Copy and paste failed: object '%s' is not a valid ldap object!"
+msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
 #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:826
 #: include/class_log.inc:88 include/functions.inc:450
-#: include/functions.inc:595 include/functions.inc:620
-#: include/functions.inc:681 include/functions.inc:1068
-#: include/functions.inc:1916 include/functions.inc:1950
-#: include/functions.inc:1970 include/class_ldap.inc:579
-#: include/class_ldap.inc:627 html/getvcard.php:39
+#: include/functions.inc:595 include/functions.inc:681
+#: include/functions.inc:1068 include/functions.inc:1874
+#: include/functions.inc:1908 include/functions.inc:1928
+#: include/class_ldap.inc:591 include/class_ldap.inc:639 html/getvcard.php:39
 msgid "Internal error"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:175
 #, php-format
-msgid "Cannot save LDAP dump: no write permission inside '%s'!"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:183
-#, php-format
-msgid "Cannot save LDAP dump: setting permissions for '%s' failed!"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:192
-#, php-format
-msgid "Cannot save LDAP dump: no write permission to '%s/%s'!"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:268
-#, php-format
-msgid "Cannot load dumped file '%s'!"
+msgid "No write permission in '%s'"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:368
+#: include/class_CopyPasteHandler.inc:364
 #, php-format
-msgid "You are going to paste the following entries '%s'."
+msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:391
+#: include/class_CopyPasteHandler.inc:387
 #, php-format
-msgid "You are going to paste the following entry '%s'."
+msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:483
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_divListUsers.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:216
-#: plugins/admin/groups/class_divListGroup.inc:219
-#: plugins/admin/acl/class_divListACL.inc:185
-#: plugins/admin/acl/class_divListACL.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/ogroups/class_divListOGroup.inc:231
+#: include/class_CopyPasteHandler.inc:479
+#: plugins/admin/users/class_divListUsers.inc:210
+#: plugins/admin/users/class_divListUsers.inc:213
+#: plugins/admin/groups/class_divListGroup.inc:220
+#: plugins/admin/groups/class_divListGroup.inc:223
+#: plugins/admin/acl/class_divListACL.inc:184
+#: plugins/admin/acl/class_divListACL.inc:187
+#: plugins/admin/ogroups/class_divListOGroup.inc:238
+#: plugins/admin/ogroups/class_divListOGroup.inc:241
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:485
-msgid "Can't paste"
+#: include/class_CopyPasteHandler.inc:481
+msgid "Cannot paste"
 msgstr ""
 
 #: include/class_plugin.inc:492
@@ -2986,7 +3046,7 @@ msgstr ""
 msgid "All categories"
 msgstr ""
 
-#: include/class_acl.inc:205 plugins/admin/acl/class_aclRole.inc:130
+#: include/class_acl.inc:205
 msgid "Reset ACLs"
 msgstr ""
 
@@ -3011,13 +3071,13 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:216 plugins/personal/generic/class_user.inc:1437
+#: include/class_acl.inc:216 plugins/personal/generic/class_user.inc:1448
 #: plugins/admin/users/class_userManagement.inc:26 html/getxls.php:91
 #: html/getxls.php:92 html/getxls.php:310
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:216 plugins/admin/groups/class_groupGeneric.inc:1020
+#: include/class_acl.inc:216 plugins/admin/groups/class_groupGeneric.inc:1019
 #: plugins/admin/groups/class_groupManagement.inc:26 html/getxls.php:126
 #: html/getxls.php:128 html/getxls.php:311
 msgid "Groups"
@@ -3034,57 +3094,29 @@ msgid "Down"
 msgstr ""
 
 #: include/class_acl.inc:429 include/class_acl.inc:472
-#: plugins/admin/users/class_divListUsers.inc:329
-#: plugins/admin/groups/class_divListGroup.inc:294
-#: plugins/admin/acl/class_divListACL.inc:243
-#: plugins/admin/acl/class_divListACL.inc:265
+#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/groups/class_divListGroup.inc:195
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/departments/class_divListDepartment.inc:186
-#: plugins/admin/ogroups/class_divListOGroup.inc:284
-msgid "edit"
-msgstr ""
-
-#: include/class_acl.inc:429 plugins/admin/acl/class_aclRole.inc:360
-msgid "Edit ACL"
-msgstr ""
-
-#: include/class_acl.inc:430 include/class_acl.inc:473
-#: plugins/admin/users/class_divListUsers.inc:353
-#: plugins/admin/groups/class_divListGroup.inc:303
-#: plugins/admin/acl/class_divListACL.inc:253
-#: plugins/admin/acl/class_divListACL.inc:269
-#: plugins/admin/acl/class_aclRole.inc:361
-#: plugins/admin/acl/class_aclRole.inc:406
-#: plugins/admin/departments/class_divListDepartment.inc:191
-#: plugins/admin/ogroups/class_divListOGroup.inc:292
-msgid "delete"
-msgstr ""
-
-#: include/class_acl.inc:430 plugins/admin/acl/class_aclRole.inc:361
-msgid "Delete ACL"
+msgid "Edit"
 msgstr ""
 
-#: include/class_acl.inc:465 plugins/admin/acl/class_aclRole.inc:398
-msgid "No ACL settings for this category"
+#: include/class_acl.inc:465
+msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:467 plugins/admin/acl/class_aclRole.inc:400
+#: include/class_acl.inc:467
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 plugins/admin/acl/class_aclRole.inc:405
-msgid "Edit categories ACLs"
+#: include/class_acl.inc:472 include/class_acl.inc:473
+msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:473 plugins/admin/acl/class_aclRole.inc:406
-msgid "Clear categories ACLs"
-msgstr ""
-
-#: include/class_acl.inc:518 plugins/admin/acl/class_aclRole.inc:422
+#: include/class_acl.inc:518
 #, php-format
-msgid "Edit ACL for '%s', scope is '%s'"
+msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
 #: include/class_acl.inc:528 plugins/admin/acl/class_aclRole.inc:432
@@ -3092,7 +3124,7 @@ msgid "All objects in current subtree"
 msgstr ""
 
 #: include/class_acl.inc:665 include/class_acl.inc:672
-msgid "Show/Hide Advanced Settings"
+msgid "Show/hide advanced settings"
 msgstr ""
 
 #: include/class_acl.inc:690
@@ -3133,7 +3165,7 @@ msgstr ""
 
 #: include/class_acl.inc:826
 #, php-format
-msgid "Unkown ACL type '%s'. Don't know how to handle it."
+msgid "Unkown ACL type '%s'!"
 msgstr ""
 
 #: include/class_acl.inc:869
@@ -3147,7 +3179,7 @@ msgid "Role: %s"
 msgstr ""
 
 #: include/class_acl.inc:931
-msgid "Unknown role, possibly removed"
+msgid "unknown role"
 msgstr ""
 
 #: include/class_acl.inc:939
@@ -3155,19 +3187,15 @@ msgstr ""
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:948
-msgid "Members:"
-msgstr ""
-
 #: include/class_acl.inc:954
-msgid "ACL is valid for all users"
+msgid "ACL takes effect for all users"
 msgstr ""
 
 #: include/class_acl.inc:1115
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1120 plugins/admin/acl/class_aclRole.inc:695
+#: include/class_acl.inc:1120
 msgid "ACL roles"
 msgstr ""
 
@@ -3202,53 +3230,31 @@ msgid "Logging failed: %s"
 msgstr ""
 
 #: include/class_log.inc:107
-msgid "Logging to MySQL disabled"
+msgid "MySQL error"
 msgstr ""
 
 #: include/class_log.inc:107
-msgid ""
-"The logging to a MySQL database is now disabled for this session of GOsa, "
-"due to communication errors with the specified logging database."
+msgid "Logging to MySQL database will be disabled for this session!"
 msgstr ""
 
 #: include/class_log.inc:120
 #, php-format
-msgid "Invalid option '%s' specified."
+msgid "Invalid option '%s' specified!"
 msgstr ""
 
 #: include/class_log.inc:124
-msgid "Specified objectType is empty or invalid"
+msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_log.inc:145
-msgid ""
-"You have enabled the logging into mysql database, but there are no logging "
-"servers available."
+#: include/class_log.inc:145 include/class_log.inc:157
+#: include/class_log.inc:165 include/class_log.inc:177
+#: include/class_log.inc:192 include/class_log.inc:228
+msgid "MySQL logging"
 msgstr ""
 
-#: include/class_log.inc:157
+#: include/class_log.inc:205
 #, php-format
-msgid "Cannot connect to logging server '%s'."
-msgstr ""
-
-#: include/class_log.inc:165
-#, php-format
-msgid "Cannot select database '%s' on server '%s': %s"
-msgstr ""
-
-#: include/class_log.inc:181
-#, php-format
-msgid "Missing logging table (%s.%s) update your GOsa logging database schema."
-msgstr ""
-
-#: include/class_log.inc:218
-#, php-format
-msgid "Couldn't add your location to the logging database, the error was: %s."
-msgstr ""
-
-#: include/class_log.inc:241
-#, php-format
-msgid "Cannot query database '%s' on server '%s': %s"
+msgid "Cannot add location to the database!"
 msgstr ""
 
 #: include/class_multi_plug.inc:362
@@ -3321,11 +3327,11 @@ msgid "Reload list"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:263
-#: plugins/admin/users/class_divListUsers.inc:165
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/acl/class_divListACL.inc:156
-#: plugins/admin/departments/class_divListDepartment.inc:147
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
+#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/acl/class_divListACL.inc:155
+#: plugins/admin/departments/class_divListDepartment.inc:146
+#: plugins/admin/ogroups/class_divListOGroup.inc:195
 msgid "Submit"
 msgstr ""
 
@@ -3362,15 +3368,11 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:109
-msgid "Config file parsing"
-msgstr ""
-
 #: include/class_config.inc:228
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:560
+#: include/class_config.inc:561
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr ""
 
@@ -3388,13 +3390,13 @@ msgid "Y-m-d, H:i:s"
 msgstr ""
 
 #: include/class_SnapShotDialog.inc:169
-#: plugins/admin/groups/class_groupGeneric.inc:1025
+#: plugins/admin/groups/class_groupGeneric.inc:1024
 #: plugins/admin/groups/generic.tpl:24 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/acl/class_aclRole.inc:705
-#: plugins/admin/departments/class_departmentGeneric.inc:262
-#: plugins/admin/departments/class_departmentGeneric.inc:577
+#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/ogroups/class_ogroup.inc:773
+#: plugins/admin/ogroups/class_ogroup.inc:818
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:160
 #: html/getxls.php:289
@@ -3417,22 +3419,11 @@ msgstr ""
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:344 include/functions.inc:371
-#: include/functions.inc:409
-#, php-format
-msgid "User login failed."
-msgstr ""
-
-#: include/functions.inc:344 include/functions.inc:371
-#: include/functions.inc:409 include/functions.inc:605
-#: include/functions.inc:620 include/functions.inc:652
-#: include/functions.inc:691 include/functions.inc:736
-#: include/functions.inc:2544
-#, php-format
-msgid "LDAP server returned: %s"
+#: include/functions.inc:380
+msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:380 include/functions.inc:450
+#: include/functions.inc:450
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -3449,19 +3440,9 @@ msgid ""
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:620
-#, php-format
-msgid "Adding a lock failed."
-msgstr ""
-
-#: include/functions.inc:652
-#, php-format
-msgid "Removing a lock failed."
-msgstr ""
-
-#: include/functions.inc:691 include/functions.inc:736
+#: include/functions.inc:605
 #, php-format
-msgid "Cannot get locking information from LDAP tree!"
+msgid "LDAP server returned: %s"
 msgstr ""
 
 #: include/functions.inc:699
@@ -3490,224 +3471,203 @@ msgstr ""
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1253
-msgid "LDAP error:"
-msgstr ""
-
-#: include/functions.inc:1254
-msgid ""
-"Problems with the LDAP server mean that you probably lost the last changes. "
-"Please check your LDAP setup for possible errors and try again."
-msgstr ""
-
-#: include/functions.inc:1260
-msgid ""
-"Please check your input and fix the error. Press 'OK' to close this message "
-"box."
-msgstr ""
-
-#: include/functions.inc:1325
+#: include/functions.inc:1283
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1327
+#: include/functions.inc:1285
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1329
+#: include/functions.inc:1287
 #, php-format
 msgid "You're going to edit the LDAP entry/entries '%s'"
 msgstr ""
 
-#: include/functions.inc:1513
+#: include/functions.inc:1471
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1541
+#: include/functions.inc:1499
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1793
+#: include/functions.inc:1751
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1837
+#: include/functions.inc:1795
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1916
+#: include/functions.inc:1874
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1950 include/functions.inc:1970
+#: include/functions.inc:1908 include/functions.inc:1928
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2212 include/functions.inc:2216
-#: include/functions.inc:2222
-msgid "'base_hook' is not available. Using default base."
+#: include/functions.inc:2170 include/functions.inc:2174
+#: include/functions.inc:2180
+msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2244
+#: include/functions.inc:2202
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2244
+#: include/functions.inc:2202
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2270
+#: include/functions.inc:2228
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2277
+#: include/functions.inc:2235
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2320
+#: include/functions.inc:2278
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2322
+#: include/functions.inc:2280
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2328
+#: include/functions.inc:2286
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2330
+#: include/functions.inc:2288
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2334
+#: include/functions.inc:2292
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2356
+#: include/functions.inc:2314
 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:2357
+#: include/functions.inc:2315
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2319
 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:2362
+#: include/functions.inc:2320
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2385
+#: include/functions.inc:2343
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2386
+#: include/functions.inc:2344
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2387
+#: include/functions.inc:2345
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2388
+#: include/functions.inc:2346
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2389
+#: include/functions.inc:2347
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2390
+#: include/functions.inc:2348
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2391
+#: include/functions.inc:2349
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2392
+#: include/functions.inc:2350
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2393
+#: include/functions.inc:2351
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2394
+#: include/functions.inc:2352
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2544
-#, php-format
-msgid "Setting the password failed!"
-msgstr ""
-
-#: include/functions.inc:2562
+#: include/functions.inc:2520
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2590
+#: include/functions.inc:2552
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/class_ldap.inc:220 include/class_ldap.inc:253
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:220 include/class_ldap.inc:253
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:579
+#: include/class_ldap.inc:591
 #, php-format
 msgid ""
-"Cannot automatically create subtrees with RDN '%s': no object class found"
+"Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:627
+#: include/class_ldap.inc:639
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:711
+#: include/class_ldap.inc:723
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:725
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:935
+#: include/class_ldap.inc:947
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:964
+#: include/class_ldap.inc:976
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -3727,10 +3687,10 @@ msgid "First name"
 msgstr ""
 
 #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1127
-#: plugins/personal/generic/class_user.inc:1139
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1155
+#: plugins/personal/generic/class_user.inc:1138
+#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1164
+#: plugins/personal/generic/class_user.inc:1166
 #: plugins/personal/generic/generic.tpl:82 plugins/admin/users/template.tpl:32
 #: html/password.php:219
 msgid "Login"
@@ -3755,7 +3715,7 @@ msgid "Personal picture"
 msgstr ""
 
 #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1461
+#: plugins/personal/generic/class_user.inc:1472
 msgid "User picture"
 msgstr ""
 
@@ -3777,11 +3737,11 @@ msgstr ""
 #: plugins/personal/generic/generic_certs.tpl:21
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
-#: plugins/admin/users/class_divListUsers.inc:188
-#: plugins/admin/groups/class_divListGroup.inc:193
-#: plugins/admin/acl/class_divListACL.inc:173
-#: plugins/admin/departments/class_divListDepartment.inc:161
-#: plugins/admin/ogroups/class_divListOGroup.inc:205
+#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:197
+#: plugins/admin/acl/class_divListACL.inc:172
+#: plugins/admin/departments/class_divListDepartment.inc:160
+#: plugins/admin/ogroups/class_divListOGroup.inc:215
 msgid "Remove"
 msgstr ""
 
@@ -3794,7 +3754,7 @@ msgid "PKCS12 certificate"
 msgstr ""
 
 #: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/class_user.inc:1424
+#: plugins/personal/generic/class_user.inc:1435
 msgid "Certificate serial number"
 msgstr ""
 
@@ -3814,318 +3774,307 @@ msgstr ""
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:492
-msgid "Please enter a valid serial number!"
+#: plugins/personal/generic/class_user.inc:496
+msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:536
+#: plugins/personal/generic/class_user.inc:541
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:551
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:549
+#: plugins/personal/generic/class_user.inc:554
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:550
+#: plugins/personal/generic/class_user.inc:555
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:555
+#: plugins/personal/generic/class_user.inc:560
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:575 html/password.php:163
+#: plugins/personal/generic/class_user.inc:586 html/password.php:163
 msgid "Password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:575
+#: plugins/personal/generic/class_user.inc:586
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:755
-#, php-format
-msgid "You have no permission to move this object to '%s'!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/class_user.inc:1564
-#: plugins/admin/users/class_userManagement.inc:739
-#: plugins/admin/users/class_userManagement.inc:817 html/getxls.php:88
+#: plugins/personal/generic/class_user.inc:1147
+#: plugins/personal/generic/class_user.inc:1189
+#: plugins/personal/generic/class_user.inc:1455
+#: plugins/personal/generic/class_user.inc:1575
+#: plugins/admin/users/class_userManagement.inc:734
+#: plugins/admin/users/class_userManagement.inc:812 html/getxls.php:88
 #: html/getxls.php:225 html/getxls.php:283 html/getxls.php:299
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1450
-#: plugins/personal/generic/class_user.inc:1549
+#: plugins/personal/generic/class_user.inc:1170
+#: plugins/personal/generic/class_user.inc:1461
+#: plugins/personal/generic/class_user.inc:1560
 #: plugins/personal/generic/multiple_generic.tpl:88
 #: plugins/personal/generic/generic.tpl:210
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1164
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1563
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
 #: plugins/personal/generic/generic.tpl:330
 #: plugins/personal/generic/generic.tpl:511
-#: plugins/admin/users/class_divListUsers.inc:275
-#: plugins/admin/groups/class_divListGroup.inc:265
-#: plugins/admin/departments/class_departmentGeneric.inc:273
+#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/groups/class_divListGroup.inc:269
+#: plugins/admin/departments/class_departmentGeneric.inc:261
 #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:508
+#: plugins/admin/ogroups/class_ogroupManagement.inc:503
 #: plugins/generic/references/class_reference.inc:60
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1566
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/generic.tpl:523
-#: plugins/admin/users/class_divListUsers.inc:277
-#: plugins/admin/departments/class_departmentGeneric.inc:276
-#: plugins/admin/departments/class_departmentGeneric.inc:587
+#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/departments/class_departmentGeneric.inc:264
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/departments/generic.tpl:91 html/getxls.php:224
 #: html/getxls.php:299
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1569
 #: plugins/personal/generic/multiple_generic.tpl:227
 #: plugins/personal/generic/generic.tpl:339 html/getxls.php:301
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1184
+#: plugins/personal/generic/class_user.inc:1572
 #: plugins/personal/generic/multiple_generic.tpl:237
 #: plugins/personal/generic/generic.tpl:347 html/getxls.php:228
 #: html/getxls.php:302
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1285
+#: plugins/personal/generic/class_user.inc:1296
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1416
+#: plugins/personal/generic/class_user.inc:1427
 #: plugins/personal/generic/multiple_generic.tpl:371
 #: plugins/personal/generic/generic.tpl:463
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1417
+#: plugins/personal/generic/class_user.inc:1428
 #: plugins/personal/generic/multiple_generic.tpl:402
 #: plugins/personal/generic/generic.tpl:488
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1418
+#: plugins/personal/generic/class_user.inc:1429
 #: plugins/personal/generic/multiple_generic.tpl:302
 #: plugins/personal/generic/generic.tpl:405
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1419
+#: plugins/personal/generic/class_user.inc:1430
 #: plugins/personal/generic/multiple_generic.tpl:449
 #: plugins/personal/generic/generic.tpl:532
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1420
+#: plugins/personal/generic/class_user.inc:1431
 #: plugins/personal/generic/multiple_generic.tpl:360
 #: plugins/personal/generic/generic.tpl:454
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1421
+#: plugins/personal/generic/class_user.inc:1432
 #: plugins/personal/generic/multiple_generic.tpl:312
 #: plugins/personal/generic/generic.tpl:413
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1422
+#: plugins/personal/generic/class_user.inc:1433
 #: plugins/personal/generic/multiple_generic.tpl:323
 #: plugins/personal/generic/generic.tpl:422
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1423
+#: plugins/personal/generic/class_user.inc:1434
 #: plugins/personal/generic/multiple_generic.tpl:334
 #: plugins/personal/generic/generic.tpl:431
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1425
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/multiple_generic.tpl:460
 #: plugins/personal/generic/generic.tpl:541
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1426
+#: plugins/personal/generic/class_user.inc:1437
 #: plugins/personal/generic/multiple_generic.tpl:382
 #: plugins/personal/generic/generic.tpl:472
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1427
+#: plugins/personal/generic/class_user.inc:1438
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/personal/generic/generic.tpl:440
-#: plugins/admin/acl/class_divListACL.inc:167
-#: plugins/admin/acl/class_divListACL.inc:226
+#: plugins/admin/acl/class_divListACL.inc:166
+#: plugins/admin/acl/class_divListACL.inc:225
 #: plugins/admin/acl/class_aclRole.inc:694
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1428
+#: plugins/personal/generic/class_user.inc:1439
 #: plugins/personal/generic/multiple_generic.tpl:392
 #: plugins/personal/generic/generic.tpl:480 html/getxls.php:229
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1432
+#: plugins/personal/generic/class_user.inc:1443
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1447
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/posix/class_posixAccount.inc:1500
+#: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/password/class_password.inc:79
-#: plugins/personal/password/class_password.inc:82
-#: plugins/personal/password/class_password.inc:85
-#: plugins/personal/password/class_password.inc:88
-#: plugins/personal/password/class_password.inc:91
-#: plugins/personal/password/class_password.inc:94
-#: plugins/personal/password/class_password.inc:108
-#: plugins/personal/password/class_password.inc:114
+#: plugins/personal/generic/class_user.inc:1453
 #: plugins/personal/password/class_password.inc:142
 msgid "User password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1443 html/getxls.php:303
+#: plugins/personal/generic/class_user.inc:1454 html/getxls.php:303
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1456
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1446
+#: plugins/personal/generic/class_user.inc:1457
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1447
+#: plugins/personal/generic/class_user.inc:1458
 #: plugins/personal/generic/multiple_generic.tpl:23
 #: plugins/personal/generic/generic.tpl:108
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1448 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1459 html/getxls.php:226
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1449
+#: plugins/personal/generic/class_user.inc:1460
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1463
 #: plugins/personal/generic/multiple_generic.tpl:159
 #: plugins/personal/generic/generic.tpl:279
-#: plugins/admin/users/class_divListUsers.inc:81
-#: plugins/admin/departments/class_divListDepartment.inc:157
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/users/class_divListUsers.inc:80
+#: plugins/admin/groups/class_divListGroup.inc:79
+#: plugins/admin/departments/class_divListDepartment.inc:156
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/generic/references/class_reference.inc:58
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1464
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1454
+#: plugins/personal/generic/class_user.inc:1465
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1455
+#: plugins/personal/generic/class_user.inc:1466
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1456
+#: plugins/personal/generic/class_user.inc:1467
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1468
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1458
+#: plugins/personal/generic/class_user.inc:1469
 #: plugins/personal/generic/multiple_generic.tpl:189
 #: plugins/personal/generic/generic.tpl:303
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1459
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/personal/generic/generic.tpl:373
-#: plugins/admin/departments/class_departmentGeneric.inc:580
+#: plugins/admin/departments/class_departmentGeneric.inc:539
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68 html/getxls.php:226
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1460
+#: plugins/personal/generic/class_user.inc:1471
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/personal/generic/generic.tpl:381
-#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:543
 #: plugins/admin/departments/generic.tpl:60 html/getxls.php:230
 #: html/getxls.php:303
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1473
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1474
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1475
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/class_user.inc:1476
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1477
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1468 html/getxls.php:228
+#: plugins/personal/generic/class_user.inc:1479 html/getxls.php:228
 #: html/getxls.php:300 html/getxls.php:302
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1480
 msgid "Fax number"
 msgstr ""
 
@@ -4175,7 +4124,7 @@ msgstr ""
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/personal/generic/generic.tpl:194
 #: plugins/personal/generic/generic.tpl:389
-#: plugins/admin/departments/class_departmentGeneric.inc:585
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/departments/generic.tpl:76 html/getxls.php:229
 msgid "Address"
 msgstr ""
@@ -4219,7 +4168,7 @@ msgstr ""
 
 #: plugins/personal/generic/main.inc:81
 #: plugins/personal/password/class_password.inc:83
-#: plugins/admin/users/class_userManagement.inc:241 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:247 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -4229,12 +4178,6 @@ msgstr ""
 msgid "You have no permission to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:173
-#: plugins/admin/users/class_divListUsers.inc:184
-#: plugins/admin/groups/class_divListGroup.inc:191
-msgid "Edit"
-msgstr ""
-
 #: plugins/personal/generic/main.inc:195
 msgid "Generic user information"
 msgstr ""
@@ -4268,7 +4211,7 @@ msgid "Password change not allowed"
 msgstr ""
 
 #: plugins/personal/password/nochange.tpl:6
-msgid "You are not allowed to change your password at this time"
+msgid "You have no permission to change your password at this time"
 msgstr ""
 
 #: plugins/personal/password/changed.tpl:3
@@ -4278,7 +4221,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:27
-msgid "Change user passwords"
+msgid "Change user password"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:80
@@ -4334,11 +4277,11 @@ msgid "Posix settings"
 msgstr ""
 
 #: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/posix/class_posixAccount.inc:1005
-#: plugins/personal/posix/class_posixAccount.inc:1008
-#: plugins/personal/posix/class_posixAccount.inc:1078
-#: plugins/personal/posix/class_posixAccount.inc:1081
-#: plugins/personal/posix/class_posixAccount.inc:1506
+#: plugins/personal/posix/class_posixAccount.inc:1003
+#: plugins/personal/posix/class_posixAccount.inc:1006
+#: plugins/personal/posix/class_posixAccount.inc:1076
+#: plugins/personal/posix/class_posixAccount.inc:1079
+#: plugins/personal/posix/class_posixAccount.inc:1504
 #: plugins/personal/posix/generic.tpl:7
 msgid "Home directory"
 msgstr ""
@@ -4349,19 +4292,19 @@ msgid "Force UID/GID"
 msgstr ""
 
 #: plugins/personal/posix/paste_generic.tpl:28
-#: plugins/personal/posix/class_posixAccount.inc:1016
-#: plugins/personal/posix/class_posixAccount.inc:1019
+#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: plugins/personal/posix/generic.tpl:56 html/getxls.php:289
 msgid "UID"
 msgstr ""
 
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/personal/posix/class_posixAccount.inc:1023
-#: plugins/personal/posix/class_posixAccount.inc:1026
+#: plugins/personal/posix/class_posixAccount.inc:1021
+#: plugins/personal/posix/class_posixAccount.inc:1024
 #: plugins/personal/posix/generic.tpl:67
-#: plugins/admin/groups/class_groupGeneric.inc:921
-#: plugins/admin/groups/class_groupGeneric.inc:924
-#: plugins/admin/groups/class_groupGeneric.inc:1030
+#: plugins/admin/groups/class_groupGeneric.inc:920
+#: plugins/admin/groups/class_groupGeneric.inc:923
+#: plugins/admin/groups/class_groupGeneric.inc:1029
 msgid "GID"
 msgstr ""
 
@@ -4386,7 +4329,7 @@ msgstr ""
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
 msgid "Choose the department the search will be based on"
 msgstr ""
 
@@ -4395,8 +4338,8 @@ msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/class_divListGroup.inc:96
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
 msgid "Regular expression for matching group names"
 msgstr ""
 
@@ -4405,19 +4348,10 @@ msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:59
-#: plugins/admin/groups/class_divListGroup.inc:97
+#: plugins/admin/groups/class_divListGroup.inc:101
 msgid "User name of which groups are shown"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:68
-#: plugins/admin/users/class_divListUsers.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "Search in subtrees"
-msgstr ""
-
 #: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
 msgstr ""
@@ -4432,7 +4366,7 @@ msgid "UNIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:38
-msgid "Edit users POSIX extensions"
+msgid "Edit users POSIX settings"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:154
@@ -4444,15 +4378,18 @@ msgid "grace time active"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:159
-msgid "active, password not changable"
+#: plugins/personal/posix/class_posixAccount.inc:161
+#: plugins/personal/posix/class_posixAccount.inc:163
+#: plugins/admin/users/class_divListUsers.inc:321
+msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:161
-msgid "active, password expired"
+#: plugins/personal/posix/class_posixAccount.inc:159
+msgid "password not changable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:163
-msgid "active"
+#: plugins/personal/posix/class_posixAccount.inc:161
+msgid "password expired"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:208
@@ -4471,16 +4408,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/users/class_divListUsers.inc:279
-#: plugins/admin/groups/class_divListGroup.inc:261
+#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/groups/class_divListGroup.inc:265
 #: plugins/generic/references/class_reference.inc:46
 #: plugins/generic/references/class_reference.inc:48
 msgid "Samba"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/users/class_divListUsers.inc:271
-#: plugins/admin/groups/class_divListGroup.inc:267
+#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/groups/class_divListGroup.inc:271
 #: plugins/admin/ogroups/tabs_ogroups.inc:168
 msgid "Environment"
 msgstr ""
@@ -4513,87 +4451,84 @@ msgstr ""
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:820
+#: plugins/personal/posix/class_posixAccount.inc:817
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:914
-msgid "Uid number"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:910
 msgid ""
-"A duplicated uid number was written for this user, if this was not intended "
-"please verify all used uidNumbers."
+"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:949
-#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:947
+#: plugins/personal/posix/class_posixAccount.inc:1140
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1034
-#: plugins/personal/posix/class_posixAccount.inc:1087
+#: plugins/personal/posix/class_posixAccount.inc:1032
+#: plugins/personal/posix/class_posixAccount.inc:1085
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1039
-#: plugins/personal/posix/class_posixAccount.inc:1092
+#: plugins/personal/posix/class_posixAccount.inc:1037
+#: plugins/personal/posix/class_posixAccount.inc:1090
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1044
-#: plugins/personal/posix/class_posixAccount.inc:1097
+#: plugins/personal/posix/class_posixAccount.inc:1042
+#: plugins/personal/posix/class_posixAccount.inc:1095
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1058
-#: plugins/personal/posix/class_posixAccount.inc:1111
+#: plugins/personal/posix/class_posixAccount.inc:1056
+#: plugins/personal/posix/class_posixAccount.inc:1109
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1321
-msgid "Cannot allocate a free ID: too many users!"
+#: plugins/personal/posix/class_posixAccount.inc:1319
+#: plugins/admin/groups/class_groupGeneric.inc:965
+msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1496
+#: plugins/personal/posix/class_posixAccount.inc:1494
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1507
+#: plugins/personal/posix/class_posixAccount.inc:1505
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1509
+#: plugins/personal/posix/class_posixAccount.inc:1507
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1511
+#: plugins/personal/posix/class_posixAccount.inc:1509
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1512
+#: plugins/personal/posix/class_posixAccount.inc:1510
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1513
+#: plugins/personal/posix/class_posixAccount.inc:1511
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1514
+#: plugins/personal/posix/class_posixAccount.inc:1512
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1515
+#: plugins/personal/posix/class_posixAccount.inc:1513
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1516
+#: plugins/personal/posix/class_posixAccount.inc:1514
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1517
+#: plugins/personal/posix/class_posixAccount.inc:1515
 msgid "System trust model"
 msgstr ""
 
@@ -4658,8 +4593,9 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_divListUsers.inc:178
-#: plugins/admin/users/class_userManagement.inc:733
+#: plugins/admin/users/class_divListUsers.inc:84
+#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_userManagement.inc:728
 msgid "Template"
 msgstr ""
 
@@ -4679,249 +4615,253 @@ msgstr ""
 msgid "List of users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:60
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+#: plugins/admin/users/class_divListUsers.inc:81
+#: plugins/admin/groups/class_divListGroup.inc:80
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/ogroups/class_divListOGroup.inc:84
+msgid "Properties"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:82
+#: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/groups/class_divListGroup.inc:81
-#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/groups/class_divListGroup.inc:181
+#: plugins/admin/acl/class_divListACL.inc:74
+#: plugins/admin/acl/class_divListACL.inc:159
+#: plugins/admin/departments/class_divListDepartment.inc:68
+#: plugins/admin/departments/class_divListDepartment.inc:149
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
-msgid "Properties"
+#: plugins/admin/ogroups/class_divListOGroup.inc:199
+msgid "Actions"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:83
-#: plugins/admin/users/class_divListUsers.inc:169
-#: plugins/admin/groups/class_divListGroup.inc:82
-#: plugins/admin/groups/class_divListGroup.inc:177
-#: plugins/admin/acl/class_divListACL.inc:75
-#: plugins/admin/acl/class_divListACL.inc:160
-#: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/departments/class_divListDepartment.inc:150
-#: plugins/admin/ogroups/class_divListOGroup.inc:86
-#: plugins/admin/ogroups/class_divListOGroup.inc:189
-msgid "Actions"
+#: plugins/admin/users/class_divListUsers.inc:84
+#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
+#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:91
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:306
+#: plugins/admin/ogroups/class_ogroup.inc:310
+#: plugins/admin/ogroups/class_ogroup.inc:314
+#: plugins/admin/ogroups/class_ogroup.inc:318
+#: plugins/admin/ogroups/class_ogroup.inc:322
+#: plugins/admin/ogroups/class_ogroup.inc:326
+#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_divListOGroup.inc:88
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:84
+msgid "templates"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:85
-msgid "Select to see template pseudo users"
+msgid "GOsa object"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:85
-msgid "Show templates"
+msgid "functional users"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:86
-msgid "Select to see users that have only a GOsa object"
+#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/groups/class_divListGroup.inc:261
+msgid "Posix"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:86
-msgid "Show functional users"
+msgid "POSIX users"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:87
-msgid "Select to see users that have posix settings"
+#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/groups/class_divListGroup.inc:263
+#: plugins/admin/ogroups/tabs_ogroups.inc:110
+#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:269
+#: plugins/generic/references/class_reference.inc:44
+msgid "Mail"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:87
-msgid "Show unix users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "Select to see users that have mail settings"
+msgid "mail users"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:88
-msgid "Show mail users"
+msgid "samba users"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:89
-msgid "Select to see users that have samba settings"
+#: plugins/generic/references/class_reference.inc:52
+msgid "Proxy"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:89
-msgid "Show samba users"
+msgid "proxy users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "Select to see users that have proxy settings"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "Show proxy users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:93
-#: plugins/admin/acl/class_divListACL.inc:81
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "Select to search within subtrees"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:97
+#: plugins/admin/users/class_divListUsers.inc:96
 #: plugins/admin/groups/group_objects.tpl:46
 msgid "Display users matching"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:165
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/acl/class_divListACL.inc:156
-#: plugins/admin/departments/class_divListDepartment.inc:147
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
+#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/groups/class_divListGroup.inc:176
+#: plugins/admin/acl/class_divListACL.inc:155
+#: plugins/admin/departments/class_divListDepartment.inc:146
+#: plugins/admin/ogroups/class_divListOGroup.inc:195
 msgid "Submit department"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:186
-#: plugins/admin/users/class_divListUsers.inc:340
-msgid "Change password"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/groups/class_divListGroup.inc:210
-#: plugins/admin/acl/class_divListACL.inc:179
-#: plugins/admin/ogroups/class_divListOGroup.inc:222
+#: plugins/admin/users/class_divListUsers.inc:204
+#: plugins/admin/groups/class_divListGroup.inc:214
+#: plugins/admin/acl/class_divListACL.inc:178
+#: plugins/admin/ogroups/class_divListOGroup.inc:232
 msgid "Copy"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:207
-#: plugins/admin/groups/class_divListGroup.inc:212
-#: plugins/admin/acl/class_divListACL.inc:181
-#: plugins/admin/ogroups/class_divListOGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/groups/class_divListGroup.inc:216
+#: plugins/admin/acl/class_divListACL.inc:180
+#: plugins/admin/ogroups/class_divListOGroup.inc:234
 msgid "Cut"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:267
+#: plugins/admin/users/class_divListUsers.inc:266
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:267
 msgid "Edit generic properties"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:269
-#: plugins/admin/groups/class_divListGroup.inc:257
-msgid "Posix"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:270
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/users/class_divListUsers.inc:271
 msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:273
-#: plugins/admin/groups/class_divListGroup.inc:259
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
-#: plugins/admin/ogroups/class_divListOGroup.inc:259
-#: plugins/generic/references/class_reference.inc:44
-msgid "Mail"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:274
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:280
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:308
-#: plugins/admin/groups/class_divListGroup.inc:287
-#: plugins/admin/acl/class_divListACL.inc:236
-#: plugins/admin/ogroups/class_divListOGroup.inc:278
+#: plugins/admin/users/class_divListUsers.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/acl/class_divListACL.inc:235
+#: plugins/admin/ogroups/class_divListOGroup.inc:288
 msgid "cut"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:308
-#: plugins/admin/groups/class_divListGroup.inc:287
-#: plugins/admin/acl/class_divListACL.inc:236
-#: plugins/admin/ogroups/class_divListOGroup.inc:278
+#: plugins/admin/users/class_divListUsers.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/acl/class_divListACL.inc:235
+#: plugins/admin/ogroups/class_divListOGroup.inc:288
 msgid "Cut this entry"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:310
-#: plugins/admin/groups/class_divListGroup.inc:289
-#: plugins/admin/acl/class_divListACL.inc:238
-#: plugins/admin/ogroups/class_divListOGroup.inc:280
+#: plugins/admin/users/class_divListUsers.inc:309
+#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/acl/class_divListACL.inc:237
+#: plugins/admin/ogroups/class_divListOGroup.inc:290
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:310
-#: plugins/admin/groups/class_divListGroup.inc:289
-#: plugins/admin/acl/class_divListACL.inc:238
-#: plugins/admin/ogroups/class_divListOGroup.inc:280
+#: plugins/admin/users/class_divListUsers.inc:309
+#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/acl/class_divListACL.inc:237
+#: plugins/admin/ogroups/class_divListOGroup.inc:290
 msgid "Copy this entry"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:319
-msgid "Deactivated"
+#: plugins/admin/users/class_divListUsers.inc:318
+msgid "inactive"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:322
-msgid "Active"
+#: plugins/admin/users/class_divListUsers.inc:328
+#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/acl/class_divListACL.inc:242
+#: plugins/admin/acl/class_divListACL.inc:264
+#: plugins/admin/departments/class_divListDepartment.inc:185
+#: plugins/admin/ogroups/class_divListOGroup.inc:294
+msgid "edit"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:330
-msgid "Edit user"
+#: plugins/admin/users/class_divListUsers.inc:329
+#: plugins/admin/users/class_userManagement.inc:460
+#: plugins/admin/users/class_userManagement.inc:571
+msgid "user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:339
+#: plugins/admin/users/class_divListUsers.inc:338
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:343
-msgid "You are not allowed to change the password for this user."
+#: plugins/admin/users/class_divListUsers.inc:342
+#: plugins/admin/users/class_divListUsers.inc:356
+msgid "Not allowed"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/users/class_userManagement.inc:576
-msgid "Delete user"
+#: plugins/admin/users/class_divListUsers.inc:352
+#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/acl/class_divListACL.inc:252
+#: plugins/admin/acl/class_divListACL.inc:268
+#: plugins/admin/departments/class_divListDepartment.inc:190
+#: plugins/admin/ogroups/class_divListOGroup.inc:302
+msgid "delete"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:357
-msgid "You are not allowed to remove this user."
+#: plugins/admin/users/class_divListUsers.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+msgid "Delete user"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:443
+#: plugins/admin/users/class_divListUsers.inc:442
 msgid "Number of listed users"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:444
-#: plugins/admin/groups/class_divListGroup.inc:361
-#: plugins/admin/departments/class_divListDepartment.inc:230
-#: plugins/admin/ogroups/class_divListOGroup.inc:342
+#: plugins/admin/users/class_divListUsers.inc:443
+#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/departments/class_divListDepartment.inc:229
+#: plugins/admin/ogroups/class_divListOGroup.inc:352
 msgid "Number of listed departments"
 msgstr ""
 
@@ -4929,79 +4869,35 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/groups/class_groupManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:199
+#: plugins/admin/groups/class_groupManagement.inc:196
 #: plugins/admin/ogroups/class_ogroupManagement.inc:173
-msgid "Daemon"
+msgid "Infrastructure error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/groups/class_groupManagement.inc:191
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#, php-format
-msgid "Something went wrong while talking to the daemon: %s."
+#: plugins/admin/users/class_userManagement.inc:299
+#: plugins/admin/users/class_userManagement.inc:354
+msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:293
-msgid "Password change failed."
+#: plugins/admin/users/class_userManagement.inc:461
+msgid "Delete users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:293
-#: plugins/admin/users/class_userManagement.inc:348
-msgid "You are not allowed to set this users password!"
+#: plugins/admin/users/class_userManagement.inc:598
+msgid "User successfully removed."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:456
-#, php-format
-msgid "You're about to delete the following entry: %s"
+#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:343
+msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:458
-#, php-format
-msgid "You're about to delete the following entries: %s"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:460
-msgid "Delete users"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:488
-#: plugins/admin/users/class_userManagement.inc:608
-msgid "User delete"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:488
-#, php-format
-msgid "You are not allowed to delete the user '%s'!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:576
-#, php-format
-msgid "You're about to delete the user %s."
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:603
-msgid "User deleted"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:603
-msgid "User successfully removed."
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:608
-msgid "You are not allowed to delete this user!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:714
-#: plugins/admin/ogroups/class_ogroup.inc:305
-msgid "none"
-msgstr ""
-
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
 
 #: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
@@ -5044,7 +4940,6 @@ msgid "Select users to add"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr ""
 
@@ -5064,75 +4959,67 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:208
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:349
+#: plugins/admin/groups/class_groupGeneric.inc:348
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:349
+#: plugins/admin/groups/class_groupGeneric.inc:348
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:349
+#: plugins/admin/groups/class_groupGeneric.inc:348
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:350
+#: plugins/admin/groups/class_groupGeneric.inc:349
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:355
+#: plugins/admin/groups/class_groupGeneric.inc:354
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:509
+#: plugins/admin/groups/class_groupGeneric.inc:508
 msgid "! unknown id"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:547
+#: plugins/admin/groups/class_groupGeneric.inc:546
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:728
+#: plugins/admin/groups/class_groupGeneric.inc:727
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:733
+#: plugins/admin/groups/class_groupGeneric.inc:732
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:966
-msgid "Cannot allocate a free ID!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:1015
+#: plugins/admin/groups/class_groupGeneric.inc:1014
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1027
+#: plugins/admin/groups/class_groupGeneric.inc:1026
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1028
+#: plugins/admin/groups/class_groupGeneric.inc:1027
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1031
+#: plugins/admin/groups/class_groupGeneric.inc:1030
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1032
+#: plugins/admin/groups/class_groupGeneric.inc:1031
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1033
+#: plugins/admin/groups/class_groupGeneric.inc:1032
 msgid "Samba domain name"
 msgstr ""
 
@@ -5141,83 +5028,74 @@ msgstr ""
 msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:61
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:80
-msgid "Groupname / Department"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:84
 msgid "Select to see groups that are primary groups of users"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:85
-msgid "Show primary groups"
+msgid "primary groups"
 msgstr ""
 
 #: plugins/admin/groups/class_divListGroup.inc:86
-msgid "Select to see groups that have samba groups mappings"
+msgid "samba groups mappings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "Show samba groups"
+#: plugins/admin/groups/class_divListGroup.inc:87
+msgid "samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "Select to see groups that have applications configured"
+#: plugins/admin/groups/class_divListGroup.inc:88
+msgid "application settings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "Show application groups"
+#: plugins/admin/groups/class_divListGroup.inc:89
+#: plugins/admin/ogroups/class_divListOGroup.inc:93
+#: plugins/admin/ogroups/class_divListOGroup.inc:94
+msgid "application groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "Select to see groups that have mail settings"
+#: plugins/admin/groups/class_divListGroup.inc:90
+msgid "mail settings"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "Show mail groups"
+#: plugins/admin/groups/class_divListGroup.inc:91
+msgid "mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:92
 msgid "Select to see normal groups that have only functional aspects"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:89
-msgid "Show functional groups"
+#: plugins/admin/groups/class_divListGroup.inc:93
+msgid "functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:185
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/admin/groups/class_divListGroup.inc:189
+#: plugins/admin/ogroups/class_ogroupManagement.inc:499
 #: plugins/generic/references/class_reference.inc:56
 msgid "Group"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:263
+#: plugins/admin/groups/class_divListGroup.inc:267
 #: plugins/admin/ogroups/tabs_ogroups.inc:153
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:500
 #: plugins/generic/references/class_reference.inc:62
 msgid "Application"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:294
-#: plugins/admin/departments/class_divListDepartment.inc:186
-#: plugins/admin/ogroups/class_divListOGroup.inc:284
+#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/departments/class_divListDepartment.inc:185
+#: plugins/admin/ogroups/class_divListOGroup.inc:294
 msgid "Edit this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:303
-#: plugins/admin/departments/class_divListDepartment.inc:191
-#: plugins/admin/ogroups/class_divListOGroup.inc:292
+#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/departments/class_divListDepartment.inc:190
+#: plugins/admin/ogroups/class_divListOGroup.inc:302
 msgid "Delete this entry"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:360
+#: plugins/admin/groups/class_divListGroup.inc:364
 msgid "Number of listed groups"
 msgstr ""
 
@@ -5225,57 +5103,30 @@ msgstr ""
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:352
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#, php-format
-msgid "You're about to delete the following entry %s"
-msgstr ""
-
 #: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/departments/class_departmentManagement.inc:177
-#, php-format
-msgid "You're about to delete the following entries %s"
+#: plugins/admin/groups/class_groupManagement.inc:433
+msgid "group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:388
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/groups/class_groupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:387
+#: plugins/admin/groups/class_groupManagement.inc:440
+#: plugins/admin/groups/class_groupManagement.inc:471
 #: plugins/admin/acl/class_aclManagement.inc:163
 #: plugins/admin/acl/class_aclManagement.inc:200
 #: plugins/admin/acl/class_aclManagement.inc:253
 #: plugins/admin/acl/class_aclManagement.inc:277
 #: plugins/admin/acl/class_aclManagement.inc:316
 #: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/admin/departments/class_departmentManagement.inc:251
-#: plugins/admin/departments/class_departmentManagement.inc:270
-#: plugins/admin/ogroups/class_ogroupManagement.inc:268
-#: plugins/admin/ogroups/class_ogroupManagement.inc:320
-#: plugins/admin/ogroups/class_ogroupManagement.inc:347
+#: plugins/admin/departments/class_departmentManagement.inc:196
+#: plugins/admin/departments/class_departmentManagement.inc:244
+#: plugins/admin/departments/class_departmentManagement.inc:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:315
+#: plugins/admin/ogroups/class_ogroupManagement.inc:342 html/getxls.php:493
+#: html/getldif.php:82
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:388
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/groups/class_groupManagement.inc:472
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
-#: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/admin/departments/class_departmentManagement.inc:251
-#: plugins/admin/departments/class_departmentManagement.inc:270
-#: plugins/admin/ogroups/class_ogroupManagement.inc:268
-#: plugins/admin/ogroups/class_ogroupManagement.inc:320
-#: plugins/admin/ogroups/class_ogroupManagement.inc:347
-msgid "You have no permission to delete this entry!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:434
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr ""
-
 #: plugins/admin/groups/remove.tpl:6
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -5319,76 +5170,70 @@ msgstr ""
 msgid "ACL Templates"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28
-#: plugins/admin/acl/class_divListACL.inc:260
-msgid "Acl"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:26
-msgid "ACLs"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:163
-msgid "You have no permission to create a new role!"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:200
-msgid "You have no permission to edit this ACL!"
-msgstr ""
-
-#: plugins/admin/acl/class_aclManagement.inc:245
-#: plugins/admin/acl/class_aclManagement.inc:309
-#, php-format
-msgid "You're about to delete the acl %s."
-msgstr ""
-
 #: plugins/admin/acl/class_divListACL.inc:51
-msgid "List of acl"
-msgstr ""
-
 #: plugins/admin/acl/class_divListACL.inc:52
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:56
-msgid "This menu allows you to edit and delete selected acls."
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:74
+#: plugins/admin/acl/class_divListACL.inc:73
 #: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:81
-msgid "Ignore subtrees"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:85
+#: plugins/admin/acl/class_divListACL.inc:84
 msgid "Display acls matching"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:244
+#: plugins/admin/acl/class_divListACL.inc:243
 msgid "Edit acl role"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:254
+#: plugins/admin/acl/class_divListACL.inc:253
 msgid "Delete acl role"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:266
+#: plugins/admin/acl/class_divListACL.inc:265
 msgid "Edit acl"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:270
+#: plugins/admin/acl/class_divListACL.inc:269
 msgid "Delete acl"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-msgid "Access control list templates"
+#: plugins/admin/acl/class_aclRole.inc:695
+#: plugins/admin/acl/class_aclRole.inc:700
+msgid "Access control roles"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit ACL roles"
+msgid "Edit AC roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:130
+msgid "Reset ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:398
+msgid "No ACL settings for this category"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:400
+#, php-format
+msgid "ACL for these objects: %s"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:405
+msgid "Edit category ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:406
+msgid "Reset category ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:422
+#, php-format
+msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:618
@@ -5400,10 +5245,6 @@ msgstr ""
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:700
-msgid "Acl roles"
-msgstr ""
-
 #: plugins/admin/acl/remove.tpl:6
 msgid ""
 "This includes all system and setup informations. Please double check if your "
@@ -5421,78 +5262,70 @@ msgstr ""
 msgid "ACL management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:257
-msgid "Required field 'Name' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:261
-msgid "Required field 'Description' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:318 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306
+#: html/password.php:58 html/main.php:152
 msgid "Fatal error"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:318
+#: plugins/admin/departments/class_departmentGeneric.inc:306
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:411
+#: plugins/admin/departments/class_departmentGeneric.inc:379
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: plugins/admin/departments/class_departmentGeneric.inc:456
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:497
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:574
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/departments/class_departmentGeneric.inc:533
 #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/ogroups/class_divListOGroup.inc:84
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:578
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 msgid "Country"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:540
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:582
-#: plugins/admin/departments/class_divListDepartment.inc:68
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:67
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:583
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 #: plugins/admin/departments/generic.tpl:24
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 #: plugins/admin/departments/generic.tpl:109
 msgid "Administrative settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:638
+#: plugins/admin/departments/class_departmentGeneric.inc:597
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:645
+#: plugins/admin/departments/class_departmentGeneric.inc:604
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:636
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -5517,10 +5350,6 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/tabs_department.inc:54
-msgid "Moving LDAP tree failed: destination tree is a subtree of the source!"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
@@ -5536,18 +5365,11 @@ msgstr ""
 msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:53
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large number of departments, you might prefer the range selectors on top "
-"of the department list."
-msgstr ""
-
-#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/departments/class_divListDepartment.inc:75
 msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:220
+#: plugins/admin/departments/class_divListDepartment.inc:219
 msgid "department"
 msgstr ""
 
@@ -5555,11 +5377,25 @@ msgstr ""
 msgid "Manage Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:245
+#: plugins/admin/departments/class_departmentManagement.inc:238
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentManagement.inc:311
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:331
+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/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -5646,77 +5482,93 @@ msgstr ""
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:190
-msgid "This 'dn' is no object group."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:307
-msgid "too many different objects!"
+#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:350
+msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:309
-msgid "users"
+#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:302
+msgid "people"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:310
+#: plugins/admin/ogroups/class_ogroup.inc:304
+#: plugins/admin/ogroups/class_ogroup.inc:306
+#: plugins/admin/ogroups/class_ogroup.inc:348
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:311
+#: plugins/admin/ogroups/class_ogroup.inc:308
+#: plugins/admin/ogroups/class_ogroup.inc:310
+#: plugins/admin/ogroups/class_ogroup.inc:349
 msgid "applications"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:312
-msgid "departments"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:313
+#: plugins/admin/ogroups/class_ogroup.inc:314
+#: plugins/admin/ogroups/class_ogroup.inc:351
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:314
+#: plugins/admin/ogroups/class_ogroup.inc:316
+#: plugins/admin/ogroups/class_ogroup.inc:318
+#: plugins/admin/ogroups/class_ogroup.inc:352
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:315
-msgid "winstations"
+#: plugins/admin/ogroups/class_ogroup.inc:320
+#: plugins/admin/ogroups/class_ogroup.inc:322
+#: plugins/admin/ogroups/class_ogroup.inc:354
+msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-msgid "terminals"
+#: plugins/admin/ogroups/class_ogroup.inc:324
+msgid "printer"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:326
+#: plugins/admin/ogroups/class_ogroup.inc:356
+msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:317
+#: plugins/admin/ogroups/class_ogroup.inc:328
+#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:355
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:318
-msgid "printers"
+#: plugins/admin/ogroups/class_ogroup.inc:345
+msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:325
-msgid "and"
+#: plugins/admin/ogroups/class_ogroup.inc:347
+msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:470
+#: plugins/admin/ogroups/class_ogroup.inc:353
+msgid "winstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:508
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:629
+#: plugins/admin/ogroups/class_ogroup.inc:674
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/ogroups/class_ogroup.inc:808
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:768
+#: plugins/admin/ogroups/class_ogroup.inc:813
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:774
+#: plugins/admin/ogroups/class_ogroup.inc:819
 msgid "Member"
 msgstr ""
 
@@ -5724,35 +5576,25 @@ msgstr ""
 msgid "Manage object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:236
-#, php-format
-msgid "You're about to delete the following object entry %s"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:234
+#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+msgid "object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:238
-#, php-format
-msgid "You're about to delete the following object entries %s"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:313
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:509
+#: plugins/admin/ogroups/class_ogroupManagement.inc:504
 #: plugins/generic/references/class_reference.inc:68
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:510
+#: plugins/admin/ogroups/class_ogroupManagement.inc:505
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/ogroups/class_ogroupManagement.inc:506
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:512
+#: plugins/admin/ogroups/class_ogroupManagement.inc:507
 #: plugins/generic/references/class_reference.inc:72
 msgid "Printer"
 msgstr ""
@@ -5761,83 +5603,15 @@ msgstr ""
 msgid "Select objects to add"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
 msgid "Display objects of department"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:45
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
 msgid "Display objects matching"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Regular expression for matching object names"
 msgstr ""
 
@@ -5846,108 +5620,59 @@ msgstr ""
 msgid "List of object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with  a "
-"large number of groups."
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:84
-msgid "Name of object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-msgid "Select to see groups containing users"
+#: plugins/admin/ogroups/class_divListOGroup.inc:83
+#: plugins/admin/ogroups/class_divListOGroup.inc:206
+#: plugins/admin/ogroups/class_divListOGroup.inc:335
+#: plugins/generic/references/class_reference.inc:70
+msgid "Object group"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:89
-msgid "Show groups containing users"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "Select to see groups containing groups"
-msgstr ""
-
 #: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "Show groups containing groups"
+msgid "user groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:91
-msgid "Select to see groups containing applications"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-msgid "Show groups containing applications"
-msgstr ""
-
 #: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "Select to see groups containing departments"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "Show groups containing departments"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-msgid "Select to see groups containing servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-msgid "Show groups containing servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-msgid "Select to see groups containing workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-msgid "Show groups containing workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-msgid "Select to see groups containing windows workstations"
+msgid "nested groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:95
-msgid "Show groups containing windows workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "Select to see groups containing terminals"
-msgstr ""
-
 #: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "Show groups containing terminals"
+msgid "department groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:97
-msgid "Select to see groups containing printer"
+#: plugins/admin/ogroups/class_divListOGroup.inc:98
+msgid "server groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-msgid "Show groups containing printer"
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
+#: plugins/admin/ogroups/class_divListOGroup.inc:100
+msgid "workstation groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "Select to see groups containing phones"
+#: plugins/admin/ogroups/class_divListOGroup.inc:101
+#: plugins/admin/ogroups/class_divListOGroup.inc:102
+msgid "windows workstation groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "Show groups containing phones"
+#: plugins/admin/ogroups/class_divListOGroup.inc:103
+#: plugins/admin/ogroups/class_divListOGroup.inc:104
+msgid "terminal groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:196
-#: plugins/admin/ogroups/class_divListOGroup.inc:325
-#: plugins/generic/references/class_reference.inc:70
-msgid "Object group"
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/ogroups/class_divListOGroup.inc:106
+msgid "printer groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:295
-msgid "You are not allowed to remove this entry."
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+msgid "phone groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:341
+#: plugins/admin/ogroups/class_divListOGroup.inc:351
 msgid "Number of listed object groups"
 msgstr ""
 
@@ -5981,10 +5706,6 @@ msgstr ""
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:52
-msgid "Proxy"
-msgstr ""
-
 #: plugins/generic/references/class_reference.inc:54
 msgid "FTP"
 msgstr ""
@@ -6038,7 +5759,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: html/getxls.php:96
+#: html/getxls.php:96 html/getxls.php:343
 #, php-format
 msgid "User list of %s on %s"
 msgstr ""
@@ -6137,22 +5858,13 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: html/getxls.php:343
-#, php-format
-msgid "User List of %s on %s"
-msgstr ""
-
 #: html/getxls.php:397
 #, php-format
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:493 html/getldif.php:82
-msgid "Permission denied!"
-msgstr ""
-
 #: html/getxls.php:493
-msgid "You are not allowed to perform this action."
+msgid "You have no permission to do LDAP exports!"
 msgstr ""
 
 #: html/getfax.php:56
@@ -6168,7 +5880,7 @@ msgid "Database query failed!"
 msgstr ""
 
 #: html/getldif.php:82
-msgid "You are not allowed to create ldap dumps."
+msgid "You have no permission to create LDAP dumps!"
 msgstr ""
 
 #: html/getldif.php:107
@@ -6197,10 +5909,6 @@ msgstr ""
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/password.php:78
-msgid "Accessibility"
-msgstr ""
-
 #: html/password.php:78 html/setup.php:66 html/index.php:166
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
@@ -6230,7 +5938,7 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/setup.php:66 html/index.php:166
+#: html/setup.php:66
 msgid "Smarty"
 msgstr ""
 
@@ -6249,18 +5957,10 @@ msgid ""
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:217
-msgid "Configuration warning"
-msgstr ""
-
 #: html/main.php:217
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
-msgid "Password reminder"
-msgstr ""
-
 #: html/main.php:356
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
@@ -6271,7 +5971,7 @@ msgstr ""
 
 #: html/main.php:366
 #, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #: html/index.php:57
@@ -6284,8 +5984,8 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141
-msgid "Configuration accessibility"
+#: html/index.php:166
+msgid "Smarty error"
 msgstr ""
 
 #: html/index.php:217
@@ -6300,16 +6000,12 @@ msgstr ""
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:255
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-
 #: html/index.php:269
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
 #: html/index.php:282
-msgid "Your ldap setup contains old schema definitions:"
+msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
 #: html/index.php:303
@@ -6329,7 +6025,7 @@ msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
 #: html/index.php:374
-msgid "Account locked. Please contact your system administrator."
+msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
 #: html/index.php:425