Updated locale

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

diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
index bb503940e49363537623f02c9cc390e2ec914866..52af930555394db03ef73fac0535e4fffd49e6b3 100644 (file)
--- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 16:40+0100\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,12 +23,12 @@ msgstr ""
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:929 include/functions.inc:2642
-#: include/functions.inc:2646 include/functions.inc:2652
+#: html/index.php:63 html/index.php:406 html/index.php:412
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/groups/class_group.inc:1003 plugins/admin/users/remove.tpl:2
+#: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
@@ -35,10 +36,10 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:946
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
-#: setup/class_setupStep_Migrate.inc:2572
-#: setup/class_setupStep_Migrate.inc:2725
-#: setup/class_setupStep_Migrate.inc:3057 setup/setup_checks.tpl:32
+#: setup/class_setupStep_Migrate.inc:661 setup/class_setupStep_Migrate.inc:804
+#: setup/class_setupStep_Migrate.inc:2573
+#: setup/class_setupStep_Migrate.inc:2726
+#: setup/class_setupStep_Migrate.inc:3058 setup/setup_checks.tpl:32
 #: setup/setup_checks.tpl:93
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -68,7 +69,7 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:139
 #: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:309
+#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:312
 #: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
 #: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
 #: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
@@ -146,7 +147,7 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: include/utils/class_msgPool.inc:327
+#: include/utils/class_msgPool.inc:330
 #, php-format
 msgid "Save"
 msgstr "Opslaan"
@@ -193,7 +194,7 @@ msgstr ""
 "Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
 "grootte limiet en laat me daarvoor in de plaats filters gebruiken"
 
-#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:345
+#: ihtml/themes/default/sizelimit.tpl:14 include/utils/class_msgPool.inc:348
 #, php-format
 msgid "Set"
 msgstr "Stel in"
@@ -220,7 +221,7 @@ msgstr "Selecteer een basis"
 
 #: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
 #: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
-#: include/utils/class_msgPool.inc:321 setup/setup_migrate.tpl:161
+#: include/utils/class_msgPool.inc:324 setup/setup_migrate.tpl:161
 #: setup/setup_migrate.tpl:212 setup/setup_migrate.tpl:260
 #: setup/setup_migrate.tpl:325 setup/setup_migrate.tpl:380
 #: setup/setup_migrate.tpl:433 setup/setup_migrate.tpl:478
@@ -247,7 +248,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1079
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1090
 msgid "Members"
 msgstr "Groepsleden"
 
@@ -284,11 +285,13 @@ msgstr "Oud wachtwoord"
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
-#: html/password.php:196 plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:249
-#: plugins/personal/generic/main.inc:97
-#: plugins/personal/generic/password.tpl:7
-#: plugins/personal/password/password.tpl:18
+#: html/password.php:196 plugins/admin/users/password.tpl:17
+#: plugins/admin/users/password.tpl:60
+#: plugins/admin/users/class_userManagement.inc:319
+#: plugins/personal/generic/password.tpl:22
+#: plugins/personal/generic/password.tpl:72
+#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
@@ -345,10 +348,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:20
-#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:772
-#: include/class_acl.inc:779 include/class_acl.inc:786
-#: include/class_acl.inc:792 include/utils/class_msgPool.inc:472
-#: plugins/admin/departments/class_department.inc:560
+#: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
+#: include/class_acl.inc:784 include/class_acl.inc:791
+#: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Object"
 
@@ -391,27 +394,30 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:500
-#: plugins/admin/departments/class_department.inc:582
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Doorgaan"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:447
-#: include/class_management.inc:583 include/class_management.inc:915
-#: include/password-methods/class_password-methods.inc:250
-#: include/class_listing.inc:477 include/functions.inc:3349
-#: include/functions.inc:3363 include/functions.inc:3393
-#: include/functions.inc:3401 include/functions.inc:3413
-#: include/functions.inc:3417 include/functions.inc:3432
-#: include/functions.inc:3441 include/functions.inc:3501
-#: include/class_tabs.inc:56 include/class_plugin.inc:658
-#: include/class_plugin.inc:700 include/class_plugin.inc:743
-#: include/class_plugin.inc:1612 include/utils/class_xml.inc:40
+#: html/index.php:228 include/class_management.inc:448
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
-#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:454
-#: include/utils/class_msgPool.inc:475 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
 #: include/class_gosaSupportDaemon.inc:1184
 #: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
@@ -421,27 +427,27 @@ msgstr "Doorgaan"
 #: include/class_CopyPasteHandler.inc:185
 #: include/class_CopyPasteHandler.inc:193
 #: include/class_CopyPasteHandler.inc:273
-#: include/class_CopyPasteHandler.inc:375 include/class_msg_dialog.inc:99
-#: plugins/admin/ogroups/class_ogroup.inc:500
+#: include/class_CopyPasteHandler.inc:377 include/class_msg_dialog.inc:99
+#: plugins/admin/ogroups/class_ogroup.inc:469
 #: plugins/admin/groups/class_group.inc:539
 #: plugins/admin/groups/class_group.inc:545
 #: plugins/admin/groups/class_group.inc:753
 #: plugins/admin/groups/class_group.inc:894
 #: plugins/admin/groups/class_group.inc:899
-#: plugins/admin/groups/class_group.inc:1230
-#: plugins/admin/departments/class_department.inc:250
+#: plugins/admin/groups/class_group.inc:1221
+#: plugins/admin/departments/class_department.inc:311
 #: plugins/admin/acl/class_aclRole.inc:681
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/personal/generic/class_user.inc:382
-#: plugins/personal/generic/class_user.inc:477
-#: plugins/personal/generic/class_user.inc:754
-#: plugins/personal/generic/class_user.inc:1143
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1168
-#: plugins/personal/generic/class_user.inc:1433
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/main.inc:115
-#: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
+#: plugins/personal/generic/class_user.inc:297
+#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
+#: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
 msgid "Error"
@@ -449,7 +455,7 @@ msgstr "Fout"
 
 #: ihtml/themes/default/msg_dialog.tpl:61
 #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:249 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:238 setup/setup_ldap.tpl:121
 msgid "Information"
 msgstr "Informatie"
 
@@ -457,17 +463,17 @@ msgstr "Informatie"
 #: ihtml/themes/default/msg_dialog.tpl:78
 #: ihtml/themes/default/msg_dialog.tpl:134
 #: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:315
+#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:318
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
-#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
-#: setup/class_setupStep_Migrate.inc:658 setup/class_setupStep_Migrate.inc:799
-#: setup/class_setupStep_Migrate.inc:1045
-#: setup/class_setupStep_Migrate.inc:2012
-#: setup/class_setupStep_Migrate.inc:2156
-#: setup/class_setupStep_Migrate.inc:2578
-#: setup/class_setupStep_Migrate.inc:2732
-#: setup/class_setupStep_Migrate.inc:3062 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:604
+#: setup/class_setupStep_Migrate.inc:657 setup/class_setupStep_Migrate.inc:800
+#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:2013
+#: setup/class_setupStep_Migrate.inc:2157
+#: setup/class_setupStep_Migrate.inc:2579
+#: setup/class_setupStep_Migrate.inc:2733
+#: setup/class_setupStep_Migrate.inc:3063 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87
 #, php-format
 msgid "Ok"
@@ -487,16 +493,10 @@ msgstr "Export was succesvol"
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:277
-#: plugins/personal/password/class_password.inc:78
-#: plugins/personal/password/class_password.inc:81
-#: plugins/personal/password/class_password.inc:84
-#: plugins/personal/password/class_password.inc:87
-#: plugins/personal/password/class_password.inc:90
-#: plugins/personal/password/class_password.inc:93
-#: plugins/personal/password/class_password.inc:107
-#: plugins/personal/password/class_password.inc:113
+#: ihtml/themes/default/password.tpl:41 html/main.php:198
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 #, fuzzy
 msgid "Password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
@@ -509,7 +509,10 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:78 ihtml/themes/default/password.tpl:79
-#: html/password.php:217 plugins/personal/password/password.tpl:13
+#: html/password.php:217 plugins/personal/generic/password.tpl:17
+#: plugins/personal/generic/password.tpl:44
+#: plugins/personal/password/password.tpl:22
+#: plugins/personal/password/password.tpl:49
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
@@ -519,7 +522,10 @@ msgid "New password repeated"
 msgstr "Nieuw wachtwoord"
 
 #: ihtml/themes/default/password.tpl:90
-#: plugins/personal/password/password.tpl:28
+#: plugins/personal/generic/password.tpl:32
+#: plugins/personal/generic/password.tpl:82
+#: plugins/personal/password/password.tpl:37
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "Wachtwoord encryptie"
@@ -612,7 +618,7 @@ msgstr "Uitloggen"
 
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
-#: include/class_pluglist.inc:207
+#: include/class_pluglist.inc:212
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -640,9 +646,9 @@ msgstr "Aangemeld:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:447
+#: html/password.php:58 html/main.php:147 include/functions.inc:454
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:372
+#: plugins/admin/departments/class_department.inc:433
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal server"
@@ -653,16 +659,16 @@ msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 
 #: html/password.php:74 html/index.php:144 html/index.php:216
-#: html/main.php:228
+#: html/main.php:268
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
-#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
-#: include/functions.inc:3023 include/functions.inc:3055
-#: include/functions.inc:3068 include/utils/class_timezone.inc:47
-#: include/class_config.inc:154 include/class_config.inc:694
-#: include/class_config.inc:1143 include/class_config.inc:1156
-#: include/class_config.inc:1174 include/class_pluglist.inc:177
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:825
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
+#: include/class_config.inc:155 include/class_config.inc:695
+#: include/class_config.inc:1146 include/class_config.inc:1159
+#: include/class_config.inc:1177 include/class_pluglist.inc:182
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:128
 #: include/class_CopyPasteHandler.inc:177
@@ -670,6 +676,7 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_group.inc:162
 #: plugins/admin/groups/class_group.inc:667
+#: plugins/admin/groups/class_group.inc:1358
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -680,7 +687,7 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:567
+#: html/password.php:159 plugins/personal/generic/class_user.inc:593
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
@@ -689,9 +696,8 @@ msgstr "Wachtwoord encryptie"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
-#: plugins/personal/generic/main.inc:92
-#: plugins/personal/password/class_password.inc:82
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -699,22 +705,24 @@ msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen."
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:88
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr ""
 "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:91
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1266
-#: plugins/personal/generic/class_user.inc:1284
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:82
+#: html/password.php:215 plugins/admin/groups/userSelect/user-list.xml:56
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
+#: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Inlognaam"
@@ -731,11 +739,11 @@ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:406
 msgid "Session will not be encrypted."
 msgstr "De sessie zal niet versleuteld zijn."
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:406
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
@@ -769,48 +777,48 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1222
-#: include/class_acl.inc:1318 include/functions.inc:476
-#: include/functions.inc:511 include/functions.inc:519
-#: include/functions.inc:564 include/functions.inc:815
-#: include/functions.inc:864 include/functions.inc:921
-#: include/functions.inc:974 include/functions.inc:3002
-#: include/functions.inc:3275 include/class_plugin.inc:1289
-#: include/class_plugin.inc:1338 include/class_plugin.inc:1342
-#: include/class_plugin.inc:1358 include/class_plugin.inc:1398
-#: include/class_plugin.inc:1456 include/class_plugin.inc:1522
-#: include/class_plugin.inc:1537 include/class_ldap.inc:752
-#: include/class_ldap.inc:1218 include/class_config.inc:317
-#: plugins/admin/ogroups/class_ogroup.inc:915
-#: plugins/admin/ogroups/class_ogroup.inc:929
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
+#: include/class_acl.inc:1329 include/functions.inc:483
+#: include/functions.inc:518 include/functions.inc:526
+#: include/functions.inc:571 include/functions.inc:840
+#: include/functions.inc:889 include/functions.inc:946
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
+#: plugins/admin/ogroups/class_ogroup.inc:888
+#: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/departments/class_department.inc:218
-#: plugins/admin/departments/class_department.inc:415
-#: plugins/admin/departments/class_department.inc:688
-#: plugins/admin/departments/class_department.inc:719
+#: plugins/admin/groups/class_group.inc:1018
+#: plugins/admin/departments/class_department.inc:279
+#: plugins/admin/departments/class_department.inc:476
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
-#: plugins/personal/generic/class_user.inc:685
-#: plugins/personal/generic/class_user.inc:1065
+#: plugins/personal/generic/class_user.inc:716
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
-#: setup/class_setupStep_Migrate.inc:1211
-#: setup/class_setupStep_Migrate.inc:1239
-#: setup/class_setupStep_Migrate.inc:1288
-#: setup/class_setupStep_Migrate.inc:1337
-#: setup/class_setupStep_Migrate.inc:2142
-#: setup/class_setupStep_Migrate.inc:2439
-#: setup/class_setupStep_Migrate.inc:2443
-#: setup/class_setupStep_Migrate.inc:2633
-#: setup/class_setupStep_Migrate.inc:2653
-#: setup/class_setupStep_Migrate.inc:2770
-#: setup/class_setupStep_Migrate.inc:3117
-#: setup/class_setupStep_Migrate.inc:3131
+#: setup/class_setupStep_Migrate.inc:1212
+#: setup/class_setupStep_Migrate.inc:1240
+#: setup/class_setupStep_Migrate.inc:1289
+#: setup/class_setupStep_Migrate.inc:1338
+#: setup/class_setupStep_Migrate.inc:2143
+#: setup/class_setupStep_Migrate.inc:2440
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2634
+#: setup/class_setupStep_Migrate.inc:2654
+#: setup/class_setupStep_Migrate.inc:2771
+#: setup/class_setupStep_Migrate.inc:3118
+#: setup/class_setupStep_Migrate.inc:3132
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -849,7 +857,7 @@ msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Account is geblokkeerd. Neem a.u.b. contact op met de systeembeheerder."
 
-#: html/index.php:420
+#: html/index.php:412
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -873,46 +881,47 @@ msgid "PHP configuration"
 msgstr "FAX database"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "FATAAL: 'Register globals' is geactiveerd in PHP. GOsa zal niemand laten "
 "inloggen totdat dit opgelost is door een systeembeheerder."
 
-#: html/main.php:228
+#: html/main.php:198
+#, fuzzy
+msgid "Your password is about to expire, please change your password!"
+msgstr "Uw wachtwoord zal spoedig verlopen! Kies a.u.b. een nieuw wachtwoord."
+
+#: html/main.php:268
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:285
+#: html/main.php:325
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:339
-#, fuzzy
-msgid "Your password is about to expire, please change your password!"
-msgstr "Uw wachtwoord zal spoedig verlopen! Kies a.u.b. een nieuw wachtwoord."
-
-#: html/main.php:349
+#: html/main.php:373
 #, fuzzy
 msgid "Plugin"
 msgstr "in"
 
-#: html/main.php:350
+#: html/main.php:374
 #, fuzzy, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
 
-#: html/main.php:364
+#: html/main.php:388
 #, fuzzy
 msgid "Configuration Error"
 msgstr "Configuratie bestand"
 
-#: html/main.php:365
+#: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -953,37 +962,37 @@ msgid "The filter is incomplete!"
 msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
-#: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1560
-#: include/class_plugin.inc:1572 include/class_plugin.inc:1587
-#: include/class_plugin.inc:1600
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:616
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
+#: plugins/admin/users/class_userManagement.inc:236
+#: plugins/admin/users/class_userManagement.inc:745
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:575
-#: plugins/admin/users/class_userManagement.inc:579
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1560
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: include/class_management.inc:473 include/class_management.inc:510
-#: include/class_management.inc:524 include/class_plugin.inc:1572
-#: include/class_plugin.inc:1587 include/class_plugin.inc:1600
+#: include/class_management.inc:474 include/class_management.inc:511
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: include/class_management.inc:583
+#: include/class_management.inc:584
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
@@ -1004,19 +1013,19 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1144 include/class_config.inc:1175
+#: include/class_config.inc:1147 include/class_config.inc:1178
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1160
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -1033,68 +1042,74 @@ msgstr "Toegangsopties"
 msgid "Manage access control lists"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:213 plugins/admin/acl/class_aclRole.inc:127
+#: include/class_acl.inc:120 include/class_acl.inc:581
+#: include/class_acl.inc:1009
+#, fuzzy, php-format
+msgid "All users"
+msgstr "gebruikers"
+
+#: include/class_acl.inc:214 plugins/admin/acl/class_aclRole.inc:127
 #, fuzzy
 msgid "All categories"
 msgstr "Categorie toevoegen"
 
-#: include/class_acl.inc:221
+#: include/class_acl.inc:222
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:222 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "One level"
 msgstr "Log prioriteit"
 
-#: include/class_acl.inc:223 include/class_acl.inc:228
+#: include/class_acl.inc:224 include/class_acl.inc:229
 #: plugins/admin/acl/class_aclRole.inc:136
 #, fuzzy
 msgid "Current object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:137
+#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:137
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Subonderdelen negeren"
 
-#: include/class_acl.inc:225 plugins/admin/acl/class_aclRole.inc:138
+#: include/class_acl.inc:226 plugins/admin/acl/class_aclRole.inc:138
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:226 include/class_acl.inc:229
+#: include/class_acl.inc:227 include/class_acl.inc:230
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:232 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1600
-#: setup/class_setupStep_Migrate.inc:1039
+#: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1666
+#: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Gebruikers"
 
-#: include/class_acl.inc:232 plugins/admin/groups/class_group.inc:1189
+#: include/class_acl.inc:233 plugins/admin/groups/class_group.inc:1180
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: setup/class_setupStep_Migrate.inc:1042
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Groups"
 msgstr "Groepen"
 
-#: include/class_acl.inc:494 include/class_listing.inc:239
-#: include/class_listing.inc:996 include/class_listing.inc:998
-#: include/class_sortableListing.inc:225
+#: include/class_acl.inc:496 include/class_listing.inc:242
+#: include/class_listing.inc:999 include/class_listing.inc:1001
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Omhoog"
 
-#: include/class_acl.inc:496 include/class_listing.inc:239
-#: include/class_sortableListing.inc:225
+#: include/class_acl.inc:498 include/class_listing.inc:242
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Omlaag"
 
-#: include/class_acl.inc:501 include/class_acl.inc:549
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_acl.inc:503 include/class_acl.inc:551
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
+#: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/acl/class_aclRole.inc:377
@@ -1102,140 +1117,140 @@ msgstr "Omlaag"
 msgid "Edit"
 msgstr "Bewerken"
 
-#: include/class_acl.inc:501 include/class_acl.inc:505
-#: include/class_acl.inc:1254 include/class_acl.inc:1255
-#: include/class_acl.inc:1260 include/class_tabs.inc:401
+#: include/class_acl.inc:503 include/class_acl.inc:507
+#: include/class_acl.inc:1265 include/class_acl.inc:1266
+#: include/class_acl.inc:1271 include/class_tabs.inc:401
 #: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
 #: plugins/admin/acl/class_aclRole.inc:382
 #: plugins/admin/acl/class_aclRole.inc:762
 msgid "ACL"
 msgstr "Rechten"
 
-#: include/class_acl.inc:505 include/class_acl.inc:553
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
-#: include/utils/class_msgPool.inc:339 plugins/admin/acl/class_aclRole.inc:381
+#: include/class_acl.inc:507 include/class_acl.inc:555
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
+#: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: include/class_acl.inc:541
+#: include/class_acl.inc:543
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:543
+#: include/class_acl.inc:545
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:549 include/class_acl.inc:553
+#: include/class_acl.inc:551 include/class_acl.inc:555
 #, fuzzy
 msgid "category ACL"
 msgstr "Categorie"
 
-#: include/class_acl.inc:603
+#: include/class_acl.inc:608
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:613 plugins/admin/acl/class_aclRole.inc:460
+#: include/class_acl.inc:618 plugins/admin/acl/class_aclRole.inc:460
 msgid "All objects in current subtree"
 msgstr ""
 
-#: include/class_acl.inc:774 include/class_acl.inc:781
+#: include/class_acl.inc:779 include/class_acl.inc:786
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Geavanceerde telefoon instellingen"
 
-#: include/class_acl.inc:798
+#: include/class_acl.inc:803
 #, fuzzy
 msgid "Create objects"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:799
+#: include/class_acl.inc:804
 #, fuzzy
 msgid "Move objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:800
+#: include/class_acl.inc:805
 #, fuzzy
 msgid "Remove objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:802
+#: include/class_acl.inc:807
 #, fuzzy
 msgid "Grant permission to owner"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_acl.inc:806 include/class_acl.inc:911
-#: include/class_acl.inc:915
+#: include/class_acl.inc:811 include/class_acl.inc:916
+#: include/class_acl.inc:920
 msgid "read"
 msgstr "alleen lezen"
 
-#: include/class_acl.inc:807 include/class_acl.inc:913
-#: include/class_acl.inc:916
+#: include/class_acl.inc:812 include/class_acl.inc:918
+#: include/class_acl.inc:921
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: include/class_acl.inc:811
+#: include/class_acl.inc:816
 #, fuzzy
 msgid "Complete object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:955 include/class_session.inc:76
+#: include/class_acl.inc:960 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:604 include/functions.inc:790
-#: include/functions.inc:908 include/functions.inc:1306
-#: include/functions.inc:2370 include/functions.inc:2404
-#: include/functions.inc:2424 include/class_ldap.inc:692
-#: include/class_ldap.inc:740 include/class_log.inc:87
+#: include/functions.inc:611 include/functions.inc:815
+#: include/functions.inc:933 include/functions.inc:1331
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
+#: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
 
-#: include/class_acl.inc:955
+#: include/class_acl.inc:960
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:998
+#: include/class_acl.inc:1005
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:1058 include/class_acl.inc:1060
+#: include/class_acl.inc:1069 include/class_acl.inc:1071
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Funktie"
 
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:1071
 #, fuzzy
 msgid "unknown role"
 msgstr "! onbekend id"
 
-#: include/class_acl.inc:1068
+#: include/class_acl.inc:1079
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1085
+#: include/class_acl.inc:1096
 #, fuzzy
 msgid "inactive"
 msgstr "actief"
 
-#: include/class_acl.inc:1085
+#: include/class_acl.inc:1096
 #, fuzzy
 msgid "No members"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:1255
+#: include/class_acl.inc:1266
 #, fuzzy
 msgid "Access control list"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:1260
+#: include/class_acl.inc:1271
 #, fuzzy
 msgid "ACL roles"
 msgstr "Rechten"
@@ -1246,7 +1261,7 @@ msgstr "Rechten"
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:301 setup/setup_migrate.tpl:93
 #: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
 #: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
 #: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
@@ -1255,139 +1270,145 @@ msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 msgid "Select all"
 msgstr "Selecteer"
 
-#: include/class_listing.inc:519
+#: include/class_listing.inc:522
 #, fuzzy
 msgid "created by"
 msgstr "Aanmaken"
 
-#: include/class_listing.inc:988
+#: include/class_listing.inc:991
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: include/class_listing.inc:988 include/class_listing.inc:990
-#: include/class_baseSelector.inc:167
+#: include/class_listing.inc:991 include/class_listing.inc:993
+#: include/class_baseSelector.inc:159
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_listing.inc:996
+#: include/class_listing.inc:999
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_listing.inc:1004
+#: include/class_listing.inc:1007
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_listing.inc:1007 include/class_listing.inc:1009
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1011
+#: include/class_listing.inc:1014
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_listing.inc:1011 include/class_baseSelector.inc:210
+#: include/class_listing.inc:1014 include/class_baseSelector.inc:206
 msgid "Submit"
 msgstr "Verwerk"
 
-#: include/class_listing.inc:1106 plugins/admin/ogroups/ogroup-list.xml:62
-#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
+#: include/class_listing.inc:1109 plugins/admin/ogroups/ogroup-list.xml:62
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
+#: plugins/admin/groups/group-list.xml:79 plugins/admin/users/user-list.xml:78
 #: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
 msgid "Actions"
 msgstr "Acties"
 
-#: include/class_listing.inc:1376 include/class_listing.inc:1426
-#: include/class_plugin.inc:2084
+#: include/class_listing.inc:1380 include/class_listing.inc:1430
+#: include/class_plugin.inc:2238
 #, fuzzy
 msgid "Copy"
 msgstr "kopieer"
 
-#: include/class_listing.inc:1382 include/class_listing.inc:1416
-#: include/class_plugin.inc:2088
+#: include/class_listing.inc:1386 include/class_listing.inc:1420
+#: include/class_plugin.inc:2242
 #, fuzzy
 msgid "Cut"
 msgstr "knippen"
 
-#: include/class_listing.inc:1390 include/class_listing.inc:1392
-#: include/class_plugin.inc:2095 include/class_plugin.inc:2098
-#: include/class_CopyPasteHandler.inc:514
+#: include/class_listing.inc:1394 include/class_listing.inc:1396
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
+#: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1416 include/class_plugin.inc:2042
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1426 include/class_plugin.inc:2050
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1458 include/class_listing.inc:1460
+#: include/class_listing.inc:1462 include/class_listing.inc:1464
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1474
+#: include/class_listing.inc:1478
 #, fuzzy
 msgid "Export list"
 msgstr "Exporteer"
 
-#: include/class_listing.inc:1509 include/class_listing.inc:1510
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2016
+#: include/class_listing.inc:1513 include/class_listing.inc:1514
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1519 include/class_plugin.inc:2023
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1520 include/class_plugin.inc:2024
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Exporteer"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
-#: include/functions.inc:127
+#: include/functions.inc:134
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:134
+#: include/functions.inc:141
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:448
+#: include/functions.inc:455
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:519
+#: include/functions.inc:526
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/functions.inc:604
+#: include/functions.inc:611
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/functions.inc:790 include/functions.inc:908
+#: include/functions.inc:815 include/functions.inc:933
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:800
+#: include/functions.inc:825
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1396,12 +1417,12 @@ msgstr ""
 "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u."
 "b. de 'config' regel in gosa.conf!"
 
-#: include/functions.inc:800
+#: include/functions.inc:825
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server"
 
-#: include/functions.inc:929
+#: include/functions.inc:954
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1410,12 +1431,12 @@ msgstr ""
 "Er zijn meerdere blokkades voor het te blokkeren object gevonden. Dat zou "
 "niet mogelijk moeten zijn. Meervoudige verwijzingen worden opgeschoond."
 
-#: include/functions.inc:1233
+#: include/functions.inc:1258
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1235
+#: include/functions.inc:1260
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1424,166 +1445,176 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1252
+#: include/functions.inc:1277
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1642
+#: include/functions.inc:1667
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1644
+#: include/functions.inc:1669
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1646
+#: include/functions.inc:1671
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "U staat op het punt de invoer '%s' te kopieren."
 
-#: include/functions.inc:1886
+#: include/functions.inc:1911
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1915 include/class_filter.inc:314
+#: include/functions.inc:1940 include/class_filter.inc:315
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:2227 include/class_filter.inc:280
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2273
+#: include/functions.inc:2313
+#, fuzzy, php-format
+msgid "GOsa %s"
+msgstr "Log DB gebruiker"
+
+#: include/functions.inc:2320
+#, fuzzy, php-format
+msgid "GOsa %s snapshot (Rev %s)"
+msgstr "GOsa ontwikkelversie (Revisie %s)"
+
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2404 include/functions.inc:2424
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/functions.inc:2642 include/functions.inc:2646
-#: include/functions.inc:2652
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2676
+#: include/functions.inc:2723
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP beheer"
 
-#: include/functions.inc:2676
+#: include/functions.inc:2723
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan de schema informatie niet ophalen van de server. Schema controle is "
 "onmogelijk!"
 
-#: include/functions.inc:2702
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2709
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2754
+#: include/functions.inc:2801
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: include/functions.inc:2757
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2762
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2765
+#: include/functions.inc:2812
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2787
+#: include/functions.inc:2834
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2788
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2792
+#: include/functions.inc:2839
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2793
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2817
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Duits"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Frans"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italiaans"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Spaans"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Engels"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: include/functions.inc:2823
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Pools"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2872
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2873
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Naam"
 
-#: include/functions.inc:2827
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:3022
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1591,53 +1622,53 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/functions.inc:3055
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3068
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3349 include/functions.inc:3363
-#: include/functions.inc:3401 include/functions.inc:3413
-#: include/functions.inc:3417 include/functions.inc:3432
-#: include/functions.inc:3441
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/functions.inc:3349
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3363
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3393
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/functions.inc:3401
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3463 include/functions.inc:3467
 #, fuzzy
 msgid "no ID available!"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:3441
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3501
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr ""
@@ -1678,31 +1709,31 @@ msgstr ""
 #: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:105
-#: plugins/admin/ogroups/class_ogroup.inc:1004
+#: plugins/admin/ogroups/class_ogroup.inc:977
 #: plugins/admin/ogroups/generic.tpl:15
 #: plugins/admin/ogroups/ogroup-list.xml:49
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/groups/class_group.inc:1193
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/groups/class_group.inc:1184
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:92
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:123
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:92
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:91
 #: plugins/admin/departments/domain.tpl:19
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:298
-#: plugins/admin/departments/class_department.inc:605
+#: plugins/admin/departments/class_department.inc:359
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1820,45 +1851,45 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:24
+#: include/class_filter.inc:322 include/utils/class_msgPool.inc:24
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
 msgid "Search in subtrees"
 msgstr "Zoek binnen subtree"
 
-#: include/class_plugin.inc:509
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1814
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1814
+#: include/class_plugin.inc:1968
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
 
-#: include/class_plugin.inc:1815 setup/class_setupStep_Migrate.inc:1249
-#: setup/class_setupStep_Migrate.inc:1299
-#: setup/class_setupStep_Migrate.inc:1347
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
+#: setup/class_setupStep_Migrate.inc:1300
+#: setup/class_setupStep_Migrate.inc:1348
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: include/class_plugin.inc:1998 include/class_plugin.inc:2000
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 #, fuzzy
 msgid "Restore"
 msgstr "Opnieuw proberen"
 
-#: include/class_plugin.inc:2042
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "knippen"
 
-#: include/class_plugin.inc:2050
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "kopieer"
 
@@ -2158,75 +2189,76 @@ msgstr "Het vereiste veld '(Achter)naam' is leeg."
 msgid "Example"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:292
+#: include/utils/class_msgPool.inc:295
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: include/utils/class_msgPool.inc:293
+#: include/utils/class_msgPool.inc:296
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:293
+#: include/utils/class_msgPool.inc:296
 #, fuzzy, php-format
 msgid "'%s' are not allowed!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: include/utils/class_msgPool.inc:296
+#: include/utils/class_msgPool.inc:299
 #, fuzzy, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Het veld 'Naam' bevat ongeldige karakters."
 
-#: include/utils/class_msgPool.inc:303
+#: include/utils/class_msgPool.inc:306
 #, fuzzy, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Verwijder printer mogelijkheden"
 
-#: include/utils/class_msgPool.inc:333
+#: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
-#: plugins/personal/generic/generic.tpl:250
-#: setup/class_setupStep_Migrate.inc:2868
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
+#: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
 
-#: include/utils/class_msgPool.inc:333
+#: include/utils/class_msgPool.inc:336
 #, fuzzy, php-format
 msgid "Add %s"
 msgstr "Toevoegen"
 
-#: include/utils/class_msgPool.inc:339
+#: include/utils/class_msgPool.inc:342
 #, fuzzy, php-format
 msgid "Delete %s"
 msgstr "Verwijderen"
 
-#: include/utils/class_msgPool.inc:345
+#: include/utils/class_msgPool.inc:348
 #, fuzzy, php-format
 msgid "Set %s"
 msgstr "Stel in"
 
-#: include/utils/class_msgPool.inc:351
+#: include/utils/class_msgPool.inc:354
 #, fuzzy, php-format
 msgid "Edit..."
 msgstr "Bewerken"
 
-#: include/utils/class_msgPool.inc:351
+#: include/utils/class_msgPool.inc:354
 #, fuzzy, php-format
 msgid "Edit %s..."
 msgstr "Bewerk gebruiker"
 
-#: include/utils/class_msgPool.inc:357
+#: include/utils/class_msgPool.inc:360
 msgid "Back"
 msgstr "Terug"
 
-#: include/utils/class_msgPool.inc:377
+#: include/utils/class_msgPool.inc:380
 #, fuzzy, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dit account heeft geen geldige GOsa extensies."
 
-#: include/utils/class_msgPool.inc:383
+#: include/utils/class_msgPool.inc:386
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. You can disable them by clicking below."
@@ -2234,7 +2266,7 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden ingeschakeld. U kunt deze uitschakelen "
 "door de knop hieronder te gebruiken."
 
-#: include/utils/class_msgPool.inc:386 include/utils/class_msgPool.inc:393
+#: include/utils/class_msgPool.inc:389 include/utils/class_msgPool.inc:396
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -2243,7 +2275,7 @@ msgstr ""
 "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
 "moet u eerst het samba / omgevings account verwijderen."
 
-#: include/utils/class_msgPool.inc:402
+#: include/utils/class_msgPool.inc:405
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. You can enable them by clicking below."
@@ -2251,7 +2283,7 @@ msgstr ""
 "Dit account heeft POSIX mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: include/utils/class_msgPool.inc:405 include/utils/class_msgPool.inc:412
+#: include/utils/class_msgPool.inc:408 include/utils/class_msgPool.inc:415
 #, fuzzy, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
@@ -2260,233 +2292,233 @@ msgstr ""
 "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
 "moet u eerst het samba / omgevings account verwijderen."
 
-#: include/utils/class_msgPool.inc:420
+#: include/utils/class_msgPool.inc:423
 #, fuzzy, php-format
 msgid "Add %s settings"
 msgstr "Programma instellingen"
 
-#: include/utils/class_msgPool.inc:426
+#: include/utils/class_msgPool.inc:429
 #, fuzzy, php-format
 msgid "Remove %s settings"
 msgstr "Posix instellingen"
 
-#: include/utils/class_msgPool.inc:432
+#: include/utils/class_msgPool.inc:435
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
 "veranderen"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "January"
 msgstr "Januari"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "February"
 msgstr "Februari"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "March"
 msgstr "Maart"
 
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:441
 msgid "April"
 msgstr "April"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "May"
 msgstr "Mei"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "June"
 msgstr "Juni"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "July"
 msgstr "Juli"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "August"
 msgstr "Augustus"
 
-#: include/utils/class_msgPool.inc:439
+#: include/utils/class_msgPool.inc:442
 msgid "September"
 msgstr "September"
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "October"
 msgstr "Oktober"
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "November"
 msgstr "November"
 
-#: include/utils/class_msgPool.inc:440
+#: include/utils/class_msgPool.inc:443
 msgid "December"
 msgstr "December"
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 #, fuzzy
 msgid "Sunday"
 msgstr "Achternaam"
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 #, fuzzy
 msgid "Monday"
 msgstr "maand"
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Tuesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Wednesday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Thursday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Friday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:446
+#: include/utils/class_msgPool.inc:449
 msgid "Saturday"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:453
+#: include/utils/class_msgPool.inc:456
 #, fuzzy
 msgid "MySQL operation failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 #, fuzzy
 msgid "read operation"
 msgstr "E-mail opties"
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 msgid "add operation"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:461
+#: include/utils/class_msgPool.inc:464
 #, fuzzy
 msgid "modify operation"
 msgstr "Persoonlijke informatie"
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 #, fuzzy
 msgid "delete operation"
 msgstr "Selecteer om werkstations te zien"
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 #, fuzzy
 msgid "search operation"
 msgstr "Het account verloopt op"
 
-#: include/utils/class_msgPool.inc:462
+#: include/utils/class_msgPool.inc:465
 #, fuzzy
 msgid "authentication"
 msgstr "Nagios authenticatie"
 
-#: include/utils/class_msgPool.inc:465
+#: include/utils/class_msgPool.inc:468
 #, fuzzy, php-format
 msgid "LDAP %s failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:467
+#: include/utils/class_msgPool.inc:470
 #, fuzzy
 msgid "LDAP operation failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:485
 #, fuzzy
 msgid "Upload failed!"
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
 
-#: include/utils/class_msgPool.inc:485
+#: include/utils/class_msgPool.inc:488
 #, fuzzy, php-format
 msgid "Upload failed: %s"
 msgstr "Log DB gebruiker"
 
-#: include/utils/class_msgPool.inc:492
+#: include/utils/class_msgPool.inc:495
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:497
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:501 include/utils/class_msgPool.inc:504
+#: include/utils/class_msgPool.inc:504 include/utils/class_msgPool.inc:507
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:507
+#: include/utils/class_msgPool.inc:510
 #, fuzzy, php-format
 msgid "This '%s' is still in use."
 msgstr "Deze 'dn' is geen groep."
 
-#: include/utils/class_msgPool.inc:509
+#: include/utils/class_msgPool.inc:512
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:515
+#: include/utils/class_msgPool.inc:518
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:521
+#: include/utils/class_msgPool.inc:524
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:527
+#: include/utils/class_msgPool.inc:530
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:533
+#: include/utils/class_msgPool.inc:536
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:539
+#: include/utils/class_msgPool.inc:542
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:545
+#: include/utils/class_msgPool.inc:548
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/utils/class_msgPool.inc:551
+#: include/utils/class_msgPool.inc:554
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:557
+#: include/utils/class_msgPool.inc:560
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: include/utils/class_msgPool.inc:563
+#: include/utils/class_msgPool.inc:566
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/utils/class_msgPool.inc:569
+#: include/utils/class_msgPool.inc:572
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
 "setup?"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:575
+#: include/utils/class_msgPool.inc:578
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -2500,28 +2532,33 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:692
+#: include/class_ldap.inc:693
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:740
+#: include/class_ldap.inc:744
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:827
+#: include/class_ldap.inc:831
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 
-#: include/class_ldap.inc:829
+#: include/class_ldap.inc:833
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1051
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2530,7 +2567,7 @@ msgstr ""
 "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
 "beginnen met 'dn: ...' op regel %s"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2572,29 +2609,29 @@ msgstr "Kan bestand '%s' niet aanmaken."
 msgid "Cannot remove entry %s!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_config.inc:151
+#: include/class_config.inc:152
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML fout in gosa.conf: %s op regel %d"
 
-#: include/class_config.inc:317
+#: include/class_config.inc:318
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
 "systeembeheerder."
 
-#: include/class_config.inc:694
+#: include/class_config.inc:695
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
-#: include/class_config.inc:1102
+#: include/class_config.inc:1105
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuratie bestand"
 
-#: include/class_config.inc:1102
+#: include/class_config.inc:1105
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2604,12 +2641,15 @@ msgstr ""
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:178
+#: include/class_pluglist.inc:183
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
-#: include/class_pluglist.inc:197 include/class_pluglist.inc:198
-#: include/class_pluglist.inc:311
+#: include/class_pluglist.inc:202 include/class_pluglist.inc:203
+#: include/class_pluglist.inc:316
+#: plugins/admin/departments/class_department.inc:145
+#: plugins/personal/generic/class_user.inc:273
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -2640,17 +2680,17 @@ msgstr ""
 msgid "No write permission in '%s'"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_CopyPasteHandler.inc:394
+#: include/class_CopyPasteHandler.inc:396
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:418
+#: include/class_CopyPasteHandler.inc:420
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:516
+#: include/class_CopyPasteHandler.inc:572
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Plakken onmogelijk"
@@ -2660,12 +2700,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:993
-#: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:742
-#: plugins/admin/departments/class_department.inc:595
+#: plugins/admin/ogroups/class_ogroup.inc:966
+#: plugins/admin/groups/class_group.inc:1174
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Algemeen"
@@ -2678,7 +2718,7 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "E-mail"
@@ -2686,14 +2726,14 @@ msgstr "E-mail"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "Fax"
 
@@ -2711,7 +2751,7 @@ msgstr "Ftp"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
-#: plugins/admin/groups/group-list.xml:79
+#: plugins/admin/groups/group-list.xml:96
 #: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Groep"
@@ -2722,10 +2762,9 @@ msgstr "Groep"
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:237
-#: plugins/personal/generic/class_user.inc:1619
-#: plugins/personal/generic/generic.tpl:288
-#: plugins/personal/generic/multiple_generic.tpl:159
+#: plugins/admin/departments/class_departmentManagement.inc:249
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Afdeling"
 
@@ -2733,16 +2772,14 @@ msgstr "Afdeling"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:770
-#: plugins/admin/departments/generic.tpl:82
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1309
-#: plugins/personal/generic/class_user.inc:1729
-#: plugins/personal/generic/generic.tpl:339
-#: plugins/personal/generic/generic.tpl:520
-#: plugins/personal/generic/multiple_generic.tpl:217
-#: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/departments/generic.tpl:106
+#: plugins/admin/departments/class_department.inc:370
+#: plugins/admin/departments/organization.tpl:105
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefoon"
@@ -2824,6 +2861,7 @@ msgstr "Het GOsa team"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/personal/posix/groupSelect/group-list.xml:11
@@ -2840,6 +2878,7 @@ msgstr "Terminal"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
 #: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
@@ -2847,62 +2886,74 @@ msgid "User"
 msgstr "Gebruiker"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
-#: plugins/admin/ogroups/class_ogroup.inc:799
-#: plugins/admin/ogroups/class_ogroup.inc:814
-#: plugins/admin/ogroups/class_ogroup.inc:1002
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:29
+#: plugins/admin/ogroups/class_ogroup.inc:768
+#: plugins/admin/ogroups/class_ogroup.inc:783
+#: plugins/admin/ogroups/class_ogroup.inc:787
+#: plugins/admin/ogroups/class_ogroup.inc:975
+#: plugins/admin/ogroups/ogroup-filter.tpl:29
 #: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userSelect/user-filter.tpl:17
+#: plugins/admin/groups/group-filter.tpl:21
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:17
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/groups/class_group.inc:1054
-#: plugins/admin/groups/class_group.inc:1065
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1084
-#: plugins/admin/groups/class_group.inc:1098
-#: plugins/admin/groups/class_group.inc:1105
-#: plugins/admin/groups/class_group.inc:1192
-#: plugins/admin/users/class_userManagement.inc:412
-#: plugins/admin/users/class_userManagement.inc:459
-#: plugins/admin/departments/class_domain.inc:43
-#: plugins/admin/departments/class_domain.inc:45
-#: plugins/admin/departments/class_domain.inc:50
-#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:21
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/groups/class_group.inc:1045
+#: plugins/admin/groups/class_group.inc:1056
+#: plugins/admin/groups/class_group.inc:1058
+#: plugins/admin/groups/class_group.inc:1075
+#: plugins/admin/groups/class_group.inc:1089
+#: plugins/admin/groups/class_group.inc:1096
+#: plugins/admin/groups/class_group.inc:1183
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
+#: plugins/admin/users/user-filter.tpl:24
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
 #: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:90
+#: plugins/admin/departments/dep-filter.tpl:15
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
 #: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
 #: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
 #: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:288
-#: plugins/admin/departments/class_department.inc:290
-#: plugins/admin/departments/class_department.inc:295
-#: plugins/admin/departments/class_department.inc:302
-#: plugins/admin/departments/class_department.inc:306
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:90
+#: plugins/admin/departments/class_department.inc:349
+#: plugins/admin/departments/class_department.inc:351
+#: plugins/admin/departments/class_department.inc:356
+#: plugins/admin/departments/class_department.inc:363
+#: plugins/admin/departments/class_department.inc:367
 #: plugins/admin/acl/class_aclRole.inc:733
 #: plugins/admin/acl/class_aclRole.inc:745
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1271
-#: plugins/personal/generic/class_user.inc:1289
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1744
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
+#: plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:23
+#: plugins/personal/posix/groupSelect/group-filter.tpl:21
 #: plugins/personal/posix/groupSelect/group-list.xml:41
 #: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
@@ -2910,32 +2961,32 @@ msgstr "Naam"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
 #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1003
+#: plugins/admin/ogroups/class_ogroup.inc:976
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/groups/userSelect/user-list.tpl:13
 #: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl:13
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl:13
 #: plugins/admin/groups/group-list.tpl:13
-#: plugins/admin/groups/class_group.inc:1194
+#: plugins/admin/groups/class_group.inc:1185
 #: plugins/admin/users/user-list.tpl:13
 #: plugins/admin/departments/locality.tpl:28
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/admin/departments/class_domain.inc:88
-#: plugins/admin/departments/class_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_domain.inc:92
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/class_organizationGeneric.inc:125
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_dcObject.inc:93
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:607
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1614
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -2946,6 +2997,7 @@ msgstr "Basis"
 #: plugins/admin/ogroups/ogroup-filter.tpl:3
 #: plugins/admin/groups/userSelect/user-filter.tpl:3
 #: plugins/admin/groups/group-filter.tpl:3
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl:3
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:3
 #: plugins/admin/users/user-filter.tpl:3
 #: plugins/admin/departments/dep-filter.tpl:3
@@ -3007,7 +3059,7 @@ msgstr ""
 "mogelijkheid voor GOsa is om uw data terug te krijgen."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:999
+#: plugins/admin/ogroups/class_ogroup.inc:972
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -3018,7 +3070,7 @@ msgstr "Naam van objectgroepen"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:189
+#: plugins/admin/users/class_userManagement.inc:204
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP fout"
@@ -3033,108 +3085,108 @@ msgstr "Sjabloon"
 msgid "Windows Install"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:249
+#: plugins/admin/ogroups/class_ogroup.inc:238
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:385
-#: plugins/admin/users/class_userManagement.inc:337
-#: plugins/admin/users/class_userManagement.inc:371
-#: plugins/admin/users/class_userManagement.inc:402
+#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:387
+#: plugins/admin/ogroups/class_ogroup.inc:356
 msgid "too many different objects!"
 msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:389
+#: plugins/admin/ogroups/class_ogroup.inc:358
 msgid "users"
 msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:390
+#: plugins/admin/ogroups/class_ogroup.inc:359
 msgid "groups"
 msgstr "groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/ogroups/class_ogroup.inc:360
 msgid "applications"
 msgstr "programma's"
 
-#: plugins/admin/ogroups/class_ogroup.inc:392
+#: plugins/admin/ogroups/class_ogroup.inc:361
 msgid "departments"
 msgstr "afdelingen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:393
+#: plugins/admin/ogroups/class_ogroup.inc:362
 msgid "servers"
 msgstr "servers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:394
+#: plugins/admin/ogroups/class_ogroup.inc:363
 msgid "workstations"
 msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:395
+#: plugins/admin/ogroups/class_ogroup.inc:364
 #, fuzzy
 msgid "winstations"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:396
+#: plugins/admin/ogroups/class_ogroup.inc:365
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:366
 msgid "phones"
 msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_ogroup.inc:398
+#: plugins/admin/ogroups/class_ogroup.inc:367
 msgid "printers"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/ogroups/class_ogroup.inc:412
 #: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 #: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: plugins/admin/ogroups/class_ogroup.inc:443
+#: plugins/admin/ogroups/class_ogroup.inc:412
 #: plugins/admin/groups/class_group.inc:433
 #: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "volledige toegang"
 
-#: plugins/admin/ogroups/class_ogroup.inc:444
+#: plugins/admin/ogroups/class_ogroup.inc:413
 #: plugins/admin/groups/class_group.inc:434
 #: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:632
+#: plugins/admin/ogroups/class_ogroup.inc:601
 msgid "Non existing dn:"
 msgstr "Niet bestaande dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:789
+#: plugins/admin/ogroups/class_ogroup.inc:758
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:792
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:994
+#: plugins/admin/ogroups/class_ogroup.inc:967
 #, fuzzy
 msgid "Object group generic"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1005
+#: plugins/admin/ogroups/class_ogroup.inc:978
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1006
+#: plugins/admin/ogroups/class_ogroup.inc:979
 #, fuzzy
 msgid "Member"
 msgstr "Groepsleden"
@@ -3155,7 +3207,7 @@ msgid "Descriptive text for this group"
 msgstr "Omschrijving voor deze groep"
 
 #: plugins/admin/ogroups/generic.tpl:36
-#: plugins/admin/groups/class_group.inc:1200
+#: plugins/admin/groups/class_group.inc:1191
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Systeem vertrouwen"
@@ -3195,7 +3247,7 @@ msgstr "FAI samenvatting"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3265,7 +3317,7 @@ msgid "List of object groups"
 msgstr "Lijst met objectgroepen"
 
 #: plugins/admin/ogroups/ogroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:57 plugins/admin/users/user-list.xml:73
+#: plugins/admin/groups/group-list.xml:74 plugins/admin/users/user-list.xml:73
 #: plugins/admin/departments/locality.tpl:8
 #: plugins/admin/departments/generic.tpl:7
 #: plugins/admin/departments/domain.tpl:8
@@ -3276,15 +3328,15 @@ msgid "Properties"
 msgstr "Eigenschappen"
 
 #: plugins/admin/ogroups/ogroup-list.xml:73
-#: plugins/admin/groups/group-list.xml:73 plugins/admin/users/user-list.xml:89
+#: plugins/admin/groups/group-list.xml:90 plugins/admin/users/user-list.xml:89
 #: plugins/admin/departments/dep-list.xml:98 plugins/admin/acl/acl-list.xml:76
-#: setup/class_setupStep_Migrate.inc:1035
-#: setup/class_setupStep_Migrate.inc:1051
+#: setup/class_setupStep_Migrate.inc:1036
+#: setup/class_setupStep_Migrate.inc:1052
 msgid "Create"
 msgstr "Aanmaken"
 
 #: plugins/admin/ogroups/ogroup-list.xml:98
-#: plugins/admin/groups/group-list.xml:98
+#: plugins/admin/groups/group-list.xml:115
 #: plugins/admin/users/user-list.xml:121
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
@@ -3292,12 +3344,12 @@ msgstr "Aanmaken"
 #: plugins/personal/generic/generic_certs.tpl:21
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2869
+#: setup/class_setupStep_Migrate.inc:2870
 msgid "Remove"
 msgstr "Verwijderen"
 
 #: plugins/admin/ogroups/ogroup-list.xml:106
-#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/groups/group-list.xml:123
 #: plugins/admin/users/user-list.xml:156
 #, fuzzy
 msgid "Send message"
@@ -3376,24 +3428,26 @@ msgstr ""
 "aangezien er geen mogelijkheid voor GOsa is om deze gegevens terug te halen."
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:415
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1281
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1606
-#: plugins/personal/generic/class_user.inc:1741
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Naam"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Achternaam"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3465,6 +3519,13 @@ msgstr "Toon Samba groepen"
 msgid "Show mail groups"
 msgstr "Toon Samba groepen"
 
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
+#: setup/setup_ldap.tpl:78
+#, fuzzy
+msgid "Select user"
+msgstr "Verwijder gebruiker"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Groep instellingen"
@@ -3473,17 +3534,28 @@ msgstr "Groep instellingen"
 msgid "List of groups"
 msgstr "Lijst met groepen"
 
-#: plugins/admin/groups/group-list.xml:138
+#: plugins/admin/groups/group-list.xml:23
+#, fuzzy
+msgid "Group submenu entry"
+msgstr "Groepsleden"
+
+#: plugins/admin/groups/group-list.xml:31
+#, fuzzy
+msgid "Group menu entry"
+msgstr "Groepsleden"
+
+#: plugins/admin/groups/group-list.xml:155
 #, fuzzy
 msgid "Edit group"
 msgstr "Primaire groep"
 
-#: plugins/admin/groups/group-list.xml:151
+#: plugins/admin/groups/group-list.xml:168
 #, fuzzy
 msgid "Remove group"
 msgstr "servers"
 
 #: plugins/admin/groups/class_group.inc:162
+#: plugins/admin/groups/class_group.inc:1358
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
@@ -3541,14 +3613,14 @@ msgstr "Kan bestand '%s' niet aanmaken."
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_group.inc:1003
+#: plugins/admin/groups/class_group.inc:994
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/class_group.inc:1117
-#: plugins/admin/groups/class_group.inc:1196
+#: plugins/admin/groups/class_group.inc:1105
+#: plugins/admin/groups/class_group.inc:1108
+#: plugins/admin/groups/class_group.inc:1187
 #: plugins/personal/posix/class_posixAccount.inc:1045
 #: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
@@ -3556,32 +3628,32 @@ msgstr ""
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_group.inc:1184
+#: plugins/admin/groups/class_group.inc:1175
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/admin/groups/class_group.inc:1198
+#: plugins/admin/groups/class_group.inc:1189
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_group.inc:1199
+#: plugins/admin/groups/class_group.inc:1190
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba home"
 
-#: plugins/admin/groups/class_group.inc:1201
+#: plugins/admin/groups/class_group.inc:1192
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/class_group.inc:1202
+#: plugins/admin/groups/class_group.inc:1193
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios account"
 
-#: plugins/admin/groups/class_group.inc:1204
+#: plugins/admin/groups/class_group.inc:1195
 #, fuzzy
 msgid "Group member"
 msgstr "Groepsleden"
@@ -3602,19 +3674,19 @@ msgid "Edit posix properties"
 msgstr "Bewerk telefoon eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
@@ -3632,7 +3704,7 @@ msgid "Edit start menu properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
@@ -3657,7 +3729,8 @@ msgstr ""
 "veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord "
 "a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
 
-#: plugins/admin/users/password.tpl:8 plugins/personal/password/password.tpl:8
+#: plugins/admin/users/password.tpl:8 plugins/personal/generic/password.tpl:8
+#: plugins/personal/password/password.tpl:8
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
@@ -3665,20 +3738,54 @@ msgstr ""
 "Het veranderen van het wachtwoord is van invloed op E-mail, proxy, samba en "
 "Unix diensten."
 
-#: plugins/admin/users/password.tpl:17
-#: plugins/personal/generic/password.tpl:11
-#: plugins/personal/password/password.tpl:23
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
+#: plugins/personal/generic/password.tpl:27
+#: plugins/personal/generic/password.tpl:77
+#: plugins/personal/password/password.tpl:32
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Herhaal het nieuwe wachtwoord"
 
-#: plugins/admin/users/password.tpl:21
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 #, fuzzy
 msgid "Strength"
 msgstr "Straat"
 
-#: plugins/admin/users/password.tpl:30
-#: plugins/personal/generic/password.tpl:17
-#: plugins/personal/password/password.tpl:39
+#: plugins/admin/users/password.tpl:35
+#, fuzzy
+msgid "Password input dialog"
+msgstr "Wachtwoord"
+
+#: plugins/admin/users/password.tpl:39
+#: plugins/personal/generic/password.tpl:51
+#: plugins/personal/password/password.tpl:56
+#, fuzzy
+msgid "Use proposal"
+msgstr "groepen"
+
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
+#: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
+#, fuzzy
+msgid "Refresh"
+msgstr "Referenties"
+
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
+#, fuzzy
+msgid "Manually specify a password"
+msgstr "Geef a.u.b. uw wachtwoord op!"
+
+#: plugins/admin/users/password.tpl:84
+#, fuzzy
+msgid "Enforce password change on next login."
+msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Wachtwoord instellen"
 
@@ -3697,18 +3804,18 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:409
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Sjabloon"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Voornaam"
@@ -3718,38 +3825,38 @@ msgstr "Voornaam"
 msgid "Manage users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:278
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "Account"
 
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3757,20 +3864,20 @@ msgstr "Bewerk algemene eigenschappen"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Bewerk Netatalk eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Bewerk UNIX eigenschappen"
@@ -3878,7 +3985,7 @@ msgstr "Lijst met afdelingen"
 
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:177
+#: plugins/admin/departments/class_departmentManagement.inc:189
 #, fuzzy
 msgid "Domain"
 msgstr "in domein"
@@ -3891,30 +3998,28 @@ msgstr "Windows beheerders"
 
 #: plugins/admin/departments/dep-list.xml:31
 #: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:201
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
+#: plugins/admin/departments/class_departmentManagement.inc:213
+#: plugins/admin/departments/class_countryGeneric.inc:82
+#: plugins/admin/departments/class_countryGeneric.inc:83
 msgid "Country"
 msgstr "Land"
 
 #: plugins/admin/departments/dep-list.xml:39
 #: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:213
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
+#: plugins/admin/departments/class_departmentManagement.inc:225
+#: plugins/admin/departments/class_localityGeneric.inc:82
+#: plugins/admin/departments/class_localityGeneric.inc:83
 #, fuzzy
 msgid "Locality"
 msgstr "Plaats"
 
 #: plugins/admin/departments/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:225
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1618
-#: plugins/personal/generic/generic.tpl:280
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
+#: plugins/admin/departments/class_departmentManagement.inc:237
+#: plugins/admin/departments/class_organizationGeneric.inc:113
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -3938,27 +4043,46 @@ msgstr "Naam van de aan te maken subtree"
 msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
-#: plugins/admin/departments/locality.tpl:44
-#: plugins/admin/departments/generic.tpl:108
-#: plugins/admin/departments/class_domain.inc:89
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:44
-#: plugins/admin/departments/country.tpl:44
-#: plugins/admin/departments/dcObject.tpl:44
-#: plugins/admin/departments/class_department.inc:615
-#: plugins/admin/departments/organization.tpl:108
+#: plugins/admin/departments/locality.tpl:39
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_domain.inc:93
+#: plugins/admin/departments/class_localityGeneric.inc:93
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_countryGeneric.inc:93
+#: plugins/admin/departments/class_dcObject.inc:92
+#: plugins/admin/departments/domain.tpl:39
+#: plugins/admin/departments/country.tpl:39
+#: plugins/admin/departments/dcObject.tpl:39
+#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/organization.tpl:51
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
+#, fuzzy
+msgid "Manager"
+msgstr "Windows gebruikers"
+
+#: plugins/admin/departments/locality.tpl:67
+#: plugins/admin/departments/generic.tpl:132
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/domain.tpl:67
+#: plugins/admin/departments/country.tpl:67
+#: plugins/admin/departments/dcObject.tpl:67
+#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Administratieve instellingen"
 
-#: plugins/admin/departments/locality.tpl:46
-#: plugins/admin/departments/generic.tpl:110
-#: plugins/admin/departments/domain.tpl:46
-#: plugins/admin/departments/country.tpl:46
-#: plugins/admin/departments/dcObject.tpl:46
-#: plugins/admin/departments/organization.tpl:110
+#: plugins/admin/departments/locality.tpl:69
+#: plugins/admin/departments/generic.tpl:134
+#: plugins/admin/departments/domain.tpl:69
+#: plugins/admin/departments/country.tpl:69
+#: plugins/admin/departments/dcObject.tpl:69
+#: plugins/admin/departments/organization.tpl:133
 msgid "Tag department as an independent administrative unit"
 msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
 
@@ -3976,8 +4100,8 @@ msgid "Descriptive text for   department"
 msgstr "Omschrijving voor de afdeling"
 
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:606
+#: plugins/admin/departments/class_organizationGeneric.inc:124
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Categorie"
@@ -3987,90 +4111,84 @@ msgstr "Categorie"
 msgid "Category for this subtree"
 msgstr "Categorie voor deze subtree"
 
-#: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/generic.tpl:67
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/organization.tpl:55
-#: plugins/admin/departments/organization.tpl:67
-#: plugins/personal/generic/class_user.inc:1631
-#: plugins/personal/generic/generic.tpl:382
-#: plugins/personal/generic/multiple_generic.tpl:265
+#: plugins/admin/departments/generic.tpl:79
+#: plugins/admin/departments/generic.tpl:91
+#: plugins/admin/departments/class_localityGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_department.inc:669
+#: plugins/admin/departments/organization.tpl:78
+#: plugins/admin/departments/organization.tpl:90
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:609
-#: plugins/admin/departments/organization.tpl:59
-#: plugins/personal/generic/class_user.inc:1630
-#: plugins/personal/generic/generic.tpl:390
-#: plugins/personal/generic/multiple_generic.tpl:275
+#: plugins/admin/departments/generic.tpl:83
+#: plugins/admin/departments/class_organizationGeneric.inc:129
+#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/organization.tpl:82
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/admin/departments/generic.tpl:62
-#: plugins/admin/departments/organization.tpl:62
+#: plugins/admin/departments/generic.tpl:86
+#: plugins/admin/departments/organization.tpl:85
 msgid "State where this subtree is located"
 msgstr "Provincie waar deze subtree zich bevindt"
 
-#: plugins/admin/departments/generic.tpl:70
-#: plugins/admin/departments/organization.tpl:70
+#: plugins/admin/departments/generic.tpl:94
+#: plugins/admin/departments/organization.tpl:93
 msgid "Location of this subtree"
 msgstr "Plaats van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:75
-#: plugins/admin/departments/class_department.inc:611
-#: plugins/admin/departments/organization.tpl:75
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/multiple_generic.tpl:67
-#: plugins/personal/generic/multiple_generic.tpl:285
+#: plugins/admin/departments/generic.tpl:99
+#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/organization.tpl:98
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Adres"
 
-#: plugins/admin/departments/generic.tpl:78
-#: plugins/admin/departments/organization.tpl:78
+#: plugins/admin/departments/generic.tpl:102
+#: plugins/admin/departments/organization.tpl:101
 msgid "Postal address of this subtree"
 msgstr "Post adres van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:85
-#: plugins/admin/departments/organization.tpl:85
+#: plugins/admin/departments/generic.tpl:109
+#: plugins/admin/departments/organization.tpl:108
 msgid "Base telephone number of this subtree"
 msgstr "Basis telefoonnummer van deze subtree"
 
-#: plugins/admin/departments/generic.tpl:90
-#: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:312
-#: plugins/admin/departments/class_department.inc:613
-#: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1732
-#: plugins/personal/generic/generic.tpl:364
-#: plugins/personal/generic/generic.tpl:532
-#: plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
+#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:373
+#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/organization.tpl:113
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/admin/departments/generic.tpl:93
-#: plugins/admin/departments/organization.tpl:93
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/organization.tpl:116
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Basis Fax nummer van deze subtree"
 
-#: plugins/admin/departments/class_domain.inc:77
-#: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:189
-#: plugins/admin/departments/class_dcObject.inc:77
-#: plugins/admin/departments/class_dcObject.inc:78
+#: plugins/admin/departments/class_domain.inc:81
+#: plugins/admin/departments/class_domain.inc:82
+#: plugins/admin/departments/class_departmentManagement.inc:201
+#: plugins/admin/departments/class_dcObject.inc:81
+#: plugins/admin/departments/class_dcObject.inc:82
 #, fuzzy
 msgid "Domain Component"
 msgstr "Windows beheerders"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:596
-#: plugins/admin/departments/class_department.inc:601
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Afdelingen"
 
@@ -4079,28 +4197,28 @@ msgstr "Afdelingen"
 msgid "Manage Departments"
 msgstr "Afdelingen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:128
+#: plugins/admin/departments/class_departmentManagement.inc:122
 msgid ""
 "As soon as the tag operation has finished, you can scroll down to end of the "
 "page and    press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:122
 #, fuzzy
 msgid "Organization name"
 msgstr "Organisatie"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1632
+#: plugins/admin/departments/class_organizationGeneric.inc:131
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Adres thuis"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_organizationGeneric.inc:132
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/admin/departments/class_countryGeneric.inc:87
+#: plugins/admin/departments/class_countryGeneric.inc:91
 #: plugins/admin/departments/country.tpl:11
 #, fuzzy
 msgid "Country name"
@@ -4121,47 +4239,47 @@ msgstr "Naam van de aan te maken subtree"
 msgid "Name of country to create"
 msgstr "Naam van de aan te maken subtree"
 
-#: plugins/admin/departments/class_department.inc:372
+#: plugins/admin/departments/class_department.inc:433
 #, fuzzy
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
 "eenheid te markeren!"
 
-#: plugins/admin/departments/class_department.inc:443
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markeren van '%s'."
 
-#: plugins/admin/departments/class_department.inc:524
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
-#: plugins/admin/departments/class_department.inc:565
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
 
-#: plugins/admin/departments/class_department.inc:604
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Afdelingnaam"
 
-#: plugins/admin/departments/class_department.inc:612
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Object '%s' is al gemarkeerd"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Toevoegen van markering (%s) aan object '%s'"
 
-#: plugins/admin/departments/class_department.inc:705
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Verwijderen van markering van object '%s'"
@@ -4277,9 +4395,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1590
-#: plugins/personal/generic/generic.tpl:449
-#: plugins/personal/generic/multiple_generic.tpl:345
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Funktie"
 
@@ -4318,370 +4435,359 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Programma instellingen"
 
-#: plugins/personal/generic/class_user.inc:279
+#: plugins/personal/generic/class_user.inc:297
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:294
+#: plugins/personal/generic/class_user.inc:340
 msgid "female"
 msgstr "vrouw"
 
-#: plugins/personal/generic/class_user.inc:294
+#: plugins/personal/generic/class_user.inc:340
 msgid "male"
 msgstr "man"
 
-#: plugins/personal/generic/class_user.inc:382
+#: plugins/personal/generic/class_user.inc:408
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:477
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:522
+#: plugins/personal/generic/class_user.inc:548
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:532
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "geldig"
 
-#: plugins/personal/generic/class_user.inc:536
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "ongeldig"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:567
+#: plugins/personal/generic/class_user.inc:593
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1143
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1150
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1168
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1239
+#: plugins/personal/generic/class_user.inc:1272
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/class_user.inc:1636
-#: plugins/personal/generic/class_user.inc:1726
-#: plugins/personal/generic/generic.tpl:199
-#: plugins/personal/generic/multiple_generic.tpl:88
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1315
-#: plugins/personal/generic/class_user.inc:1735
-#: plugins/personal/generic/generic.tpl:348
-#: plugins/personal/generic/multiple_generic.tpl:227
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1738
-#: plugins/personal/generic/generic.tpl:356
-#: plugins/personal/generic/multiple_generic.tpl:237
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/class_user.inc:1611
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1433
+#: plugins/personal/generic/class_user.inc:1471
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:472
-#: plugins/personal/generic/multiple_generic.tpl:371
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1580
-#: plugins/personal/generic/generic.tpl:497
-#: plugins/personal/generic/multiple_generic.tpl:402
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1581
-#: plugins/personal/generic/generic.tpl:414
-#: plugins/personal/generic/multiple_generic.tpl:302
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:541
-#: plugins/personal/generic/multiple_generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:463
-#: plugins/personal/generic/multiple_generic.tpl:360
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:422
-#: plugins/personal/generic/multiple_generic.tpl:312
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:431
-#: plugins/personal/generic/multiple_generic.tpl:323
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:440
-#: plugins/personal/generic/multiple_generic.tpl:334
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:550
-#: plugins/personal/generic/multiple_generic.tpl:460
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:481
-#: plugins/personal/generic/multiple_generic.tpl:382
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:489
-#: plugins/personal/generic/multiple_generic.tpl:392
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/generic/class_user.inc:1661
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1599
-#: plugins/personal/posix/class_posixAccount.inc:1444
-#: plugins/personal/password/class_password.inc:150
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Mijn account"
 
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1673
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1608
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1609
-#: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/multiple_generic.tpl:23
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1612
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1613
+#: plugins/personal/generic/class_user.inc:1679
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1684
+#, fuzzy
+msgid "Login restrictions"
+msgstr "Wachtwoord verloopt op"
+
+#: plugins/personal/generic/class_user.inc:1688
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1690
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:312
-#: plugins/personal/generic/multiple_generic.tpl:189
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1693
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1625
+#: plugins/personal/generic/class_user.inc:1694
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1626
+#: plugins/personal/generic/class_user.inc:1695
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1696
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1697
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1704
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1707
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
 
+#: plugins/personal/generic/class_user.inc:1915
+#, fuzzy
+msgid "Entries differ"
+msgstr "Regels per pagina"
+
+#: plugins/personal/generic/changed.tpl:3
+#: plugins/personal/password/changed.tpl:3
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr ""
+"U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle "
+"programma's die dit wachtwoord gebruiken ook aanpast!"
+
 #: plugins/personal/generic/generic.tpl:6
-#: plugins/personal/generic/multiple_generic.tpl:5
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
-#: plugins/personal/generic/multiple_generic.tpl:13
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Verander plaatje"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/multiple_generic.tpl:33
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/generic.tpl:191
-#: plugins/personal/generic/multiple_generic.tpl:78
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/generic.tpl:212
-#: plugins/personal/generic/multiple_generic.tpl:105
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/generic.tpl:229
-#: plugins/personal/generic/multiple_generic.tpl:117
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins/personal/generic/generic.tpl:232
-#: plugins/personal/generic/multiple_generic.tpl:121
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Bewerk certificaten"
 
-#: plugins/personal/generic/generic.tpl:245
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:249
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:268
-#: plugins/personal/generic/multiple_generic.tpl:137
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:296
-#: plugins/personal/generic/multiple_generic.tpl:169
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:304
-#: plugins/personal/generic/multiple_generic.tpl:179
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:512
-#: plugins/personal/generic/multiple_generic.tpl:207
-#: plugins/personal/generic/multiple_generic.tpl:418
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:526
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
-#: plugins/personal/generic/multiple_generic.tpl:53
-msgid "Choose subtree to place user in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: plugins/personal/generic/multiple_generic.tpl:56
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
 #: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
@@ -4699,24 +4805,31 @@ msgstr "Nieuw wachtwoord instellen"
 msgid "Remove picture"
 msgstr "Plaatje verwijderen"
 
-#: plugins/personal/generic/main.inc:115
-#, fuzzy
-msgid "You have no permission to set your password!"
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
-
-#: plugins/personal/generic/main.inc:206
+#: plugins/personal/generic/main.inc:168
 msgid "Generic user information"
 msgstr "Algemene gebruikersinformatie"
 
-#: plugins/personal/generic/password.tpl:2
+#: plugins/personal/generic/password.tpl:4
+#: plugins/personal/password/password.tpl:4
 msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
 msgstr ""
-"U heeft de manier waarop uw wachtwoord wordt opgeslagen in de LDAP database "
-"veranderd. Daarom moet u het wachtwoord op dit moment opnieuw invoeren. GOsa "
-"zal dan het wachtwoord versleutelen op de door u geselecteerde methode."
+"Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De "
+"veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
+"b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
+
+#: plugins/personal/generic/password.tpl:42
+#: plugins/personal/password/password.tpl:47
+#, fuzzy
+msgid "Password change dialog"
+msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
+msgid "Clear fields"
+msgstr "Wis velden"
 
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
@@ -4730,6 +4843,17 @@ msgstr "S/MIME certificaat"
 msgid "PKCS12 certificate"
 msgstr "PKCS12 certificaat"
 
+#: plugins/personal/generic/nochange.tpl:2
+#: plugins/personal/password/nochange.tpl:2
+#, fuzzy
+msgid "You have no permission to change your password at this time"
+msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
+
+#: plugins/personal/generic/nochange.tpl:5
+#, fuzzy
+msgid "Your password hash method will not be changed!"
+msgstr "Uw wachtwoord is verlopen! Kies a.u.b. een nieuw wachtwoord. "
+
 #: plugins/personal/posix/class_posixAccount.inc:38
 #, fuzzy
 msgid "Edit users POSIX settings"
@@ -4805,7 +4929,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1450
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4842,61 +4966,61 @@ msgstr "Schaduwen van andere sessie"
 msgid "shadowInactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1440
+#: plugins/personal/posix/class_posixAccount.inc:1448
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1453
+#: plugins/personal/posix/class_posixAccount.inc:1461
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1455
+#: plugins/personal/posix/class_posixAccount.inc:1463
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/posix/class_posixAccount.inc:1456
+#: plugins/personal/posix/class_posixAccount.inc:1464
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1457
+#: plugins/personal/posix/class_posixAccount.inc:1465
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1458
+#: plugins/personal/posix/class_posixAccount.inc:1466
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1459
+#: plugins/personal/posix/class_posixAccount.inc:1467
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1460
+#: plugins/personal/posix/class_posixAccount.inc:1468
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1470
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -5005,52 +5129,35 @@ msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
 msgid "Password expires on"
 msgstr "Wachtwoord verloopt op"
 
-#: plugins/personal/password/changed.tpl:3
-msgid ""
-"You've successfully changed your password. Remember to change all programms "
-"configured to use it as well."
-msgstr ""
-"U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle "
-"programma's die dit wachtwoord gebruiken ook aanpast!"
-
 #: plugins/personal/password/main.inc:57 setup/setup_config1.tpl:136
 #, fuzzy
 msgid "Password settings"
 msgstr "Gebruikersinstellingen"
 
-#: plugins/personal/password/password.tpl:4
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
-msgstr ""
-"Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De "
-"veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
-"b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
-
-#: plugins/personal/password/password.tpl:41
-msgid "Clear fields"
-msgstr "Wis velden"
+#: plugins/personal/password/password.tpl:14
+#, fuzzy
+msgid "Your Password has expired. Please choose a new password!"
+msgstr "Uw wachtwoord is verlopen! Kies a.u.b. een nieuw wachtwoord. "
 
 #: plugins/personal/password/class_password.inc:27
 #, fuzzy
 msgid "Change user password"
 msgstr "Verander wachtwoord"
 
-#: plugins/personal/password/class_password.inc:79
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
-#: plugins/personal/password/class_password.inc:85
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
-#: plugins/personal/password/class_password.inc:94
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:108
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -5058,25 +5165,16 @@ msgstr ""
 "Het wachtwoord dat u opgegeven heeft als uw huidige wachtwoord is niet "
 "correct."
 
-#: plugins/personal/password/class_password.inc:114
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 msgid "You have no permission to change your password."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/personal/password/class_password.inc:146
+#: plugins/personal/password/class_password.inc:204
 #, fuzzy
 msgid "User password"
 msgstr "Wachtwoord wissen"
 
-#: plugins/personal/password/nochange.tpl:2
-msgid "Password change not allowed"
-msgstr "Het veranderen van het wachtwoord is niet toegestaan"
-
-#: plugins/personal/password/nochange.tpl:6
-#, fuzzy
-msgid "You have no permission to change your password at this time"
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
-
 #: setup/class_setupStep_Feedback.inc:92
 #, fuzzy
 msgid "UNIX accounts/groups"
@@ -5149,12 +5247,12 @@ msgstr ""
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:180
+#: setup/class_setupStep_Feedback.inc:181
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "Geef a.u.b. een geldige scriptnaam op."
 
-#: setup/class_setupStep_Feedback.inc:184
+#: setup/class_setupStep_Feedback.inc:185
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -5311,12 +5409,12 @@ msgid "After migration"
 msgstr "Gebruikersbeheer"
 
 #: setup/setup_migrate.tpl:54 setup/class_setupStep_Migrate.inc:376
-#: setup/class_setupStep_Migrate.inc:665 setup/class_setupStep_Migrate.inc:805
-#: setup/class_setupStep_Migrate.inc:1034
-#: setup/class_setupStep_Migrate.inc:2132
-#: setup/class_setupStep_Migrate.inc:2575
-#: setup/class_setupStep_Migrate.inc:2729
-#: setup/class_setupStep_Migrate.inc:3059
+#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:806
+#: setup/class_setupStep_Migrate.inc:1035
+#: setup/class_setupStep_Migrate.inc:2133
+#: setup/class_setupStep_Migrate.inc:2576
+#: setup/class_setupStep_Migrate.inc:2730
+#: setup/class_setupStep_Migrate.inc:3060
 #, fuzzy
 msgid "Migrate"
 msgstr "Aanmaken"
@@ -5479,12 +5577,6 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/setup_migrate.tpl:470 setup/setup_migrate.tpl:513
-#: setup/setup_migrate.tpl:557
-#, fuzzy
-msgid "Refresh"
-msgstr "Referenties"
-
 #: setup/setup_migrate.tpl:488
 msgid ""
 "The listed services are currently invalid for the GOsa version you are going "
@@ -5572,7 +5664,9 @@ msgid "GOsa requires this module for the samba integration."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:97
-msgid "GOsa requires this module to make use of SSHA encryption."
+msgid ""
+"GOsa requires either 'mhash' or the 'sha1' module to make use of SSHA "
+"encryption."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:105
@@ -6003,31 +6097,36 @@ msgid "What PHP version do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl:115
+#, fuzzy
+msgid "GOsa version"
+msgstr "Algemene wachtrij instellingen"
+
+#: setup/setup_feedback.tpl:123
 msgid "LDAP"
 msgstr ""
 
-#: setup/setup_feedback.tpl:119
+#: setup/setup_feedback.tpl:127
 msgid "What kind of LDAP server(s) do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:125
+#: setup/setup_feedback.tpl:133
 msgid "How many objects are in your LDAP?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:132
+#: setup/setup_feedback.tpl:140
 #, fuzzy
 msgid "Features"
 msgstr "Toekomstig"
 
-#: setup/setup_feedback.tpl:135
+#: setup/setup_feedback.tpl:143
 msgid "What features of GOsa do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:145
+#: setup/setup_feedback.tpl:153
 msgid "What features do you want to see in future versions of GOsa?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:152
+#: setup/setup_feedback.tpl:160
 msgid "Send feedback"
 msgstr ""
 
@@ -6068,27 +6167,27 @@ msgstr ""
 "De volgende velden definiëren de basis configuratie van GOsa's gedrag en "
 "beïnvloeden diverse eigenschappen in uw hoofd configuratie."
 
-#: setup/class_setupStep_Ldap.inc:105
+#: setup/class_setupStep_Ldap.inc:112
 #, fuzzy, php-format
 msgid "Anonymous bind to server '%s' failed!"
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
 
-#: setup/class_setupStep_Ldap.inc:107
+#: setup/class_setupStep_Ldap.inc:114
 #, fuzzy, php-format
 msgid "Bind as user '%s' failed!"
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
 
-#: setup/class_setupStep_Ldap.inc:112
+#: setup/class_setupStep_Ldap.inc:119
 #, fuzzy, php-format
 msgid "Anonymous bind to server '%s' succeeded."
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
 
-#: setup/class_setupStep_Ldap.inc:113
+#: setup/class_setupStep_Ldap.inc:120
 #, fuzzy
 msgid "Please specify user and password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: setup/class_setupStep_Ldap.inc:115
+#: setup/class_setupStep_Ldap.inc:122
 #, fuzzy, php-format
 msgid "Bind as user '%s' to server '%s' succeeded!"
 msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
@@ -6125,11 +6224,6 @@ msgstr "Nagios authenticatie"
 msgid "Admin DN"
 msgstr "Beheerders DN"
 
-#: setup/setup_ldap.tpl:78
-#, fuzzy
-msgid "Select user"
-msgstr "Verwijder gebruiker"
-
 #: setup/setup_ldap.tpl:86
 msgid "Automatically append LDAP base to admin DN"
 msgstr ""
@@ -6187,7 +6281,7 @@ msgid "Checking for invisible users"
 msgstr "Zoeken naar iconv ondersteuning"
 
 #: setup/class_setupStep_Migrate.inc:165
-#: setup/class_setupStep_Migrate.inc:3210
+#: setup/class_setupStep_Migrate.inc:3211
 #, fuzzy
 msgid "Checking for super administrator"
 msgstr "Zoeken naar enkele additionele programma's"
@@ -6234,12 +6328,12 @@ msgstr "Zoeken naar functie %s"
 #: setup/class_setupStep_Migrate.inc:240 setup/class_setupStep_Migrate.inc:292
 #: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:421
 #: setup/class_setupStep_Migrate.inc:492 setup/class_setupStep_Migrate.inc:569
-#: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:795
-#: setup/class_setupStep_Migrate.inc:891
-#: setup/class_setupStep_Migrate.inc:2037
-#: setup/class_setupStep_Migrate.inc:2505
-#: setup/class_setupStep_Migrate.inc:2696
-#: setup/class_setupStep_Migrate.inc:2833
+#: setup/class_setupStep_Migrate.inc:653 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:892
+#: setup/class_setupStep_Migrate.inc:2038
+#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2697
+#: setup/class_setupStep_Migrate.inc:2834
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "De database zoekopdracht is mislukt"
@@ -6247,12 +6341,12 @@ msgstr "De database zoekopdracht is mislukt"
 #: setup/class_setupStep_Migrate.inc:241 setup/class_setupStep_Migrate.inc:293
 #: setup/class_setupStep_Migrate.inc:358 setup/class_setupStep_Migrate.inc:422
 #: setup/class_setupStep_Migrate.inc:493 setup/class_setupStep_Migrate.inc:570
-#: setup/class_setupStep_Migrate.inc:655 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:892
-#: setup/class_setupStep_Migrate.inc:2038
-#: setup/class_setupStep_Migrate.inc:2506
-#: setup/class_setupStep_Migrate.inc:2697
-#: setup/class_setupStep_Migrate.inc:2834
+#: setup/class_setupStep_Migrate.inc:654 setup/class_setupStep_Migrate.inc:797
+#: setup/class_setupStep_Migrate.inc:893
+#: setup/class_setupStep_Migrate.inc:2039
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2698
+#: setup/class_setupStep_Migrate.inc:2835
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
@@ -6266,16 +6360,16 @@ msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:584
-#: setup/class_setupStep_Migrate.inc:597
-#: setup/class_setupStep_Migrate.inc:1031
-#: setup/class_setupStep_Migrate.inc:1049
-#: setup/class_setupStep_Migrate.inc:1989
-#: setup/class_setupStep_Migrate.inc:2002
-#: setup/class_setupStep_Migrate.inc:2057
-#: setup/class_setupStep_Migrate.inc:2078
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:3212
+#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:596
+#: setup/class_setupStep_Migrate.inc:1032
+#: setup/class_setupStep_Migrate.inc:1050
+#: setup/class_setupStep_Migrate.inc:1990
+#: setup/class_setupStep_Migrate.inc:2003
+#: setup/class_setupStep_Migrate.inc:2058
+#: setup/class_setupStep_Migrate.inc:2079
+#: setup/class_setupStep_Migrate.inc:2131
+#: setup/class_setupStep_Migrate.inc:3213
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -6300,171 +6394,171 @@ msgstr "Modus"
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:586 setup/class_setupStep_Migrate.inc:599
+#: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:598
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:663
+#: setup/class_setupStep_Migrate.inc:662
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
-#: setup/class_setupStep_Migrate.inc:1119
+#: setup/class_setupStep_Migrate.inc:712 setup/class_setupStep_Migrate.inc:857
+#: setup/class_setupStep_Migrate.inc:1120
 #, fuzzy
 msgid "Migration error"
 msgstr "Aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:713 setup/class_setupStep_Migrate.inc:856
+#: setup/class_setupStep_Migrate.inc:712 setup/class_setupStep_Migrate.inc:857
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Ga naar basis afdelingen"
 
-#: setup/class_setupStep_Migrate.inc:804
+#: setup/class_setupStep_Migrate.inc:805
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1028
+#: setup/class_setupStep_Migrate.inc:1029
 #, fuzzy, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Netatalk account aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:1033
+#: setup/class_setupStep_Migrate.inc:1034
 #, fuzzy
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
 msgstr "Netatalk account aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:1050
+#: setup/class_setupStep_Migrate.inc:1051
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1119
+#: setup/class_setupStep_Migrate.inc:1120
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1157
-#: setup/class_setupStep_Migrate.inc:1167
+#: setup/class_setupStep_Migrate.inc:1158
+#: setup/class_setupStep_Migrate.inc:1168
 #, fuzzy
 msgid "Input error"
 msgstr "PHP fout"
 
-#: setup/class_setupStep_Migrate.inc:1157
+#: setup/class_setupStep_Migrate.inc:1158
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1163
 #, fuzzy
 msgid "Password error"
 msgstr "Wachtwoord verloopt op"
 
-#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1163
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: setup/class_setupStep_Migrate.inc:1167
+#: setup/class_setupStep_Migrate.inc:1168
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: setup/class_setupStep_Migrate.inc:1200
+#: setup/class_setupStep_Migrate.inc:1201
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1239
-#: setup/class_setupStep_Migrate.inc:1288
-#: setup/class_setupStep_Migrate.inc:1337
+#: setup/class_setupStep_Migrate.inc:1240
+#: setup/class_setupStep_Migrate.inc:1289
+#: setup/class_setupStep_Migrate.inc:1338
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Ga naar de afdeling van de gebruiker"
 
-#: setup/class_setupStep_Migrate.inc:1249
+#: setup/class_setupStep_Migrate.inc:1250
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1260
-#: setup/class_setupStep_Migrate.inc:1309
+#: setup/class_setupStep_Migrate.inc:1261
+#: setup/class_setupStep_Migrate.inc:1310
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1299
+#: setup/class_setupStep_Migrate.inc:1300
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1347
+#: setup/class_setupStep_Migrate.inc:1348
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1357
+#: setup/class_setupStep_Migrate.inc:1358
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1990
+#: setup/class_setupStep_Migrate.inc:1991
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1991
-#: setup/class_setupStep_Migrate.inc:2004
+#: setup/class_setupStep_Migrate.inc:1992
+#: setup/class_setupStep_Migrate.inc:2005
 #, fuzzy
 msgid "Try to create root object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:2003
+#: setup/class_setupStep_Migrate.inc:2004
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2058
+#: setup/class_setupStep_Migrate.inc:2059
 #, fuzzy, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: setup/class_setupStep_Migrate.inc:2059
+#: setup/class_setupStep_Migrate.inc:2060
 #, fuzzy
 msgid "Please check your installation."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: setup/class_setupStep_Migrate.inc:2080
+#: setup/class_setupStep_Migrate.inc:2081
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2439
+#: setup/class_setupStep_Migrate.inc:2440
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Verplaatsen van %s naar %s"
 
-#: setup/class_setupStep_Migrate.inc:2574
+#: setup/class_setupStep_Migrate.inc:2575
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2634
+#: setup/class_setupStep_Migrate.inc:2635
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2654
-#: setup/class_setupStep_Migrate.inc:2771
+#: setup/class_setupStep_Migrate.inc:2655
+#: setup/class_setupStep_Migrate.inc:2772
 #, fuzzy, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "Log DB gebruiker"
 
-#: setup/class_setupStep_Migrate.inc:2727
+#: setup/class_setupStep_Migrate.inc:2728
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:3058
+#: setup/class_setupStep_Migrate.inc:3059
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -6868,6 +6962,37 @@ msgstr ""
 msgid "Automatic"
 msgstr "automatisch"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
+
+#, fuzzy
+#~ msgid "Group submenu menu"
+#~ msgstr "Groepsleden"
+
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#~ msgid "Select a base"
+#~ msgstr "Selecteer een basis"
+
+#, fuzzy
+#~ msgid "You have no permission to set your password!"
+#~ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
+
+#~ msgid ""
+#~ "You have changed the method your password is stored in the ldap database. "
+#~ "For that reason you've to enter your password at this point again. GOsa "
+#~ "will then encode it with the selected method."
+#~ msgstr ""
+#~ "U heeft de manier waarop uw wachtwoord wordt opgeslagen in de LDAP "
+#~ "database veranderd. Daarom moet u het wachtwoord op dit moment opnieuw "
+#~ "invoeren. GOsa zal dan het wachtwoord versleutelen op de door u "
+#~ "geselecteerde methode."
+
+#~ msgid "Password change not allowed"
+#~ msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+
 #, fuzzy
 #~ msgid "Choose a base"
 #~ msgstr "Selecteer een basis"
@@ -7270,10 +7395,6 @@ msgstr "automatisch"
 #~ msgid "Year"
 #~ msgstr "Zoeken"
 
-#, fuzzy
-#~ msgid "Password end"
-#~ msgstr "Wachtwoord"
-
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Programmanaam"
@@ -8569,10 +8690,6 @@ msgstr "automatisch"
 #~ msgid "Packages"
 #~ msgstr "Pakketten"
 
-#, fuzzy
-#~ msgid "GOsa logs"
-#~ msgstr "Log DB gebruiker"
-
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "
 #~ "your php setup."