Updated locale

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

diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
index 0e1f5139968e29e1d01214768d7d7546fe524688..45c7233bacb21c58862ed5f2ede3d004befe9d7b 100644 (file)
--- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
-"PO-Revision-Date: 2008-04-14 16:04+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
+"PO-Revision-Date: 2008-05-27 11:07+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@ msgstr "Momentanes Passwort"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -100,8 +100,8 @@ msgid "Clear fields"
 msgstr "Felder löschen"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -119,9 +119,10 @@ msgstr "Benutzer-Passwort ändern"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 msgid "Password change"
 msgstr "Passwort-Änderung"
 
@@ -131,7 +132,7 @@ msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -141,7 +142,8 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:86
 msgid "The password you've entered as 'New password' is empty."
-msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
+msgstr ""
+"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
 #: plugins/personal/password/class_password.inc:89 html/password.php:208
 msgid "The password used as new and current are too similar."
@@ -149,7 +151,8 @@ msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
 #: plugins/personal/password/class_password.inc:92 html/password.php:213
 msgid "The password used as new is to short."
-msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
+msgstr ""
+"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
 #: plugins/personal/password/class_password.inc:95
 #, php-format
@@ -169,12 +172,12 @@ msgid "You have no permission to change your password."
 msgstr "Sie haben keine Berechtigung Ihr Passwort zu ändern."
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 msgid "User password"
 msgstr "Benutzerpasswort"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Mein Konto"
@@ -195,11 +198,11 @@ msgid "Remove picture"
 msgstr "Bild entfernen"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -209,27 +212,27 @@ msgstr "Allgemein"
 msgid "Edit organizational user settings"
 msgstr "Organisationsbezogene Benutzereinstellungen bearbeiten"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "männlich"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -240,28 +243,28 @@ msgstr "männlich"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr "Fehler"
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr "Kann Datei nicht hochladen!"
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:543
+#: plugins/personal/generic/class_user.inc:548
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -269,33 +272,33 @@ msgstr ""
 "(Manche Zertifikate werden momentan nicht unterstützt und werden daher als "
 "'ungültig' angezeigt)."
 
-#: plugins/personal/generic/class_user.inc:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Zertifkat ist gültig im Zeitraum von %s bis %s (momentan: %s)."
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 msgid "Password method"
 msgstr "Passwort-Methode"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 msgid "The selected password method is no longer available."
 msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -305,58 +308,63 @@ msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Kennung"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -369,136 +377,136 @@ msgstr "Kennung"
 msgid "Name"
 msgstr "Name"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Vorname"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 msgid "Cannot open certificate!"
 msgstr "Kann Zertifikat nicht öffnen!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -506,22 +514,22 @@ msgstr "Straße"
 msgid "Role"
 msgstr "Rolle"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -531,89 +539,90 @@ msgstr "Benutzer"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Organisation"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -621,44 +630,44 @@ msgstr "Anstellungsart"
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Land"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 msgid "Fax number"
 msgstr "Faxnummer"
 
@@ -730,7 +739,7 @@ msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -748,44 +757,44 @@ msgstr "Privat-Telefon"
 msgid "Password storage"
 msgstr "Passwort-Speicherung"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Zertifikate bearbeiten"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
@@ -799,7 +808,7 @@ msgstr "Standard-Zertifikat"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Entfernen"
@@ -853,6 +862,7 @@ msgstr "Zeige Gruppen der Abteilung"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -885,21 +895,25 @@ msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Wählen Sie die hinzuzufügenden Systeme"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Zeige die Systeme der Abteilung"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Regulärer Ausdruck zum Erkennen von Mail-Adressen"
@@ -975,17 +989,18 @@ msgstr "Nicht in allen Gruppen"
 msgid "Account"
 msgstr "Konto"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "System-Vertrauen"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "UNIX"
 
@@ -1004,7 +1019,7 @@ msgstr "Nachfrist aktiv"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "aktiv"
 
@@ -1032,17 +1047,17 @@ msgid "POSIX"
 msgstr "POSIX"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Umgebung"
@@ -1050,7 +1065,8 @@ msgstr "Umgebung"
 #: plugins/personal/posix/class_posixAccount.inc:465
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
-msgstr "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
+msgstr ""
+"Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
 #: plugins/personal/posix/class_posixAccount.inc:469
 #, php-format
@@ -1068,16 +1084,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "deaktiviert"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "Vollzugriff"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
@@ -1087,19 +1106,18 @@ msgstr "erlaube Zugriff auf diese Hosts"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Warnung"
@@ -1210,7 +1228,7 @@ msgstr "Objektname"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1225,66 +1243,65 @@ msgstr "Inhalt"
 msgid "This object has no relationship to other objects."
 msgstr "Dieses Objekt hat keine Referenzen zu anderen Objekten."
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Mail"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Drucker"
 
@@ -1327,7 +1344,7 @@ msgstr ""
 "<a\thref='https://oss.gonicus.de/labs/gosa/"
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
 
@@ -1429,6 +1446,16 @@ msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
 msgid "List of departments"
 msgstr "Liste der Abteilungen"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+msgid "Select all"
+msgstr "Alle auswählen"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1441,7 +1468,7 @@ msgstr "Name der Abteilung"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1454,7 +1481,7 @@ msgstr "Regulärer Ausdruck zum Erkennen von Abteilungs-Namen"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Aktualisieren"
@@ -1462,18 +1489,19 @@ msgstr "Aktualisieren"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "Übertragen"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Anlegen"
 
@@ -1481,14 +1509,14 @@ msgstr "Anlegen"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "Bearbeiten"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
@@ -1496,14 +1524,14 @@ msgstr "Diesen Eintrag bearbeiten"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "Entfernen"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
@@ -1513,14 +1541,15 @@ msgstr "Abteilung"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 msgid "Number of listed departments"
 msgstr "Anzahl der angezeigten Abteilungen"
 
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 msgid "You are currently moving/renaming this department."
-msgstr "Momentan sind Sie dabei, diese Abteilung zu verschieben bzw. neu zu benennen."
+msgstr ""
+"Momentan sind Sie dabei, diese Abteilung zu verschieben bzw. neu zu benennen."
 
 #: plugins/admin/departments/dep_move_confirm.tpl:5
 msgid ""
@@ -1544,7 +1573,7 @@ msgstr ""
 "erwartet sein wird, vielleicht ist die beste Lösung, vorher ein Backup zu "
 "erstellen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
@@ -1571,9 +1600,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "Verschiebe '%s' nach '%s'"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Objekt"
@@ -1616,32 +1645,33 @@ msgstr "Entferne Markierung von Objekt '%s'"
 msgid "Manage Departments"
 msgstr "Abteilungen verwalten"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
-msgstr "Sie sind dabei, einen gesamten LDAP-Teilbaum unterhalb von '%s' zu löschen."
+msgstr ""
+"Sie sind dabei, einen gesamten LDAP-Teilbaum unterhalb von '%s' zu löschen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
@@ -1651,7 +1681,7 @@ msgstr ""
 "Seite scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
 "Abteilungsverwaltung fort zu fahren."
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1662,14 +1692,13 @@ msgstr ""
 "Abteilungsverwaltung fort zu fahren."
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
@@ -1695,7 +1724,6 @@ msgid "List of acls"
 msgstr "Liste der ACLs"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "Übersicht"
 
@@ -1705,14 +1733,14 @@ msgstr "Zeige ACLs, auf die zutrifft"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 msgid "Copy"
 msgstr "Kopieren"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -1721,39 +1749,39 @@ msgstr "Ausschneiden"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr "Einfügen"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "Ausschneiden"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "Kopieren"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
@@ -1783,7 +1811,7 @@ msgstr "Rollen für die Zugriffskontrolle"
 msgid "Edit AC roles"
 msgstr "ACL-Rollen bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 msgid "All categories"
 msgstr "Alle Kategorien"
 
@@ -1791,44 +1819,45 @@ msgstr "Alle Kategorien"
 msgid "Reset ACL"
 msgstr "ACL zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr "Diese Ebene"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 msgid "Current object"
 msgstr "Aktuelles Objekt"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 msgid "Complete subtree"
 msgstr "Vollständiger Teilbaum"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr "Vollständiger Teilbaum (permanent)"
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "Auf"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "Ab"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
@@ -1855,7 +1884,7 @@ msgstr "ACL-Kategorie zurücksetzen"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr "Alle Objekte im aktuellen Teilbaum"
 
@@ -1883,25 +1912,26 @@ msgstr "Zugewiesene ACL für aktuellen Eintrag"
 msgid "Choose subtree to place group in"
 msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 msgid "New ACL"
 msgstr "Neue ACL"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 msgid "ACL type"
 msgstr "ACL-Typ"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 msgid "Select an acl type"
 msgstr "Wählen Sie einen ACL-Typ"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 msgid "List of available ACL categories"
 msgstr "Liste verfügbarer ACL-Kategorien"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Objektgruppen"
 
@@ -1909,28 +1939,28 @@ msgstr "Objektgruppen"
 msgid "Manage object groups"
 msgstr "Objektgruppen verwalten"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 msgid "Infrastructure error"
 msgstr "Infrastruktur Fehler"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 msgid "object group"
 msgstr "Objektgruppe"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 msgid "Windows Install"
 msgstr "Windows Installation"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -1964,7 +1994,7 @@ msgstr "Name der Gruppe"
 msgid "Descriptive text for this group"
 msgstr "Beschreibender Text für diese Gruppe"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
@@ -1974,15 +2004,15 @@ msgid "List of object groups"
 msgstr "Liste von Objektgruppen"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2053,8 +2083,7 @@ msgstr "Telefongruppen"
 msgid "Number of listed object groups"
 msgstr "Anzahl der angezeigten Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2062,121 +2091,130 @@ msgstr "Anzahl der angezeigten Objektgruppen"
 msgid "Information"
 msgstr "Information"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 "Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe "
 "zusammenfassen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 msgid "people"
 msgstr "Personen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "Anwendungen"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 msgid "printer"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "Anwendungen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 msgid "winstations"
 msgstr "Windows-Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 msgid "You can combine two different object types at maximum, only!"
-msgstr "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
+msgstr ""
+"Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 msgid "Member"
 msgstr "Mitglied"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr "Warteschlange"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
-msgstr "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+msgid "Systems"
+msgstr "Systeme"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Geräte"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Start"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr "FAI-Übersicht"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Anwendungen"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Arbeitsplätze"
 
@@ -2209,43 +2247,35 @@ msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 msgid "You have no permission to change this users password!"
 msgstr "Sie haben keine Berechtigung dieses Passwort zu ändern!"
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "Sie sind nicht berechtigt das Objekt '%s' zu verändern!"
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 msgid "You have no permission to use this template!"
 msgstr "Sie sind nicht berechtigt diese Vorlage zu nutzen!"
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 msgid "user"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:564
-msgid "Delete users"
-msgstr "Benutzer entfernen"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "Benutzer entfernen"
-
-#: plugins/admin/users/class_userManagement.inc:701
-msgid "User successfully removed."
-msgstr "Benutzer erfolgreich entfernt."
+#: plugins/admin/users/class_userManagement.inc:633
+msgid "You have no permission to change the lock status for this user!"
+msgstr ""
+"Sie haben keine Berechtigung den Bearbeitungs-Status dieses Benutzers zu "
+"ändern!"
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Vorlage"
 
@@ -2271,13 +2301,15 @@ msgstr "Vorlage anwenden"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr "Das Anwenden einer Vorlage ersetzt alle in der Vorlage definierten Attribute des Benutzers."
+msgstr ""
+"Das Anwenden einer Vorlage ersetzt alle in der Vorlage definierten Attribute "
+"des Benutzers."
 
 #: plugins/admin/users/templatize.tpl:33
 msgid "No templates available!"
 msgstr "Keine Vorlagen verfügbar!"
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Benutzerverwaltung"
 
@@ -2315,7 +2347,7 @@ msgid "functional users"
 msgstr "funktionale Benutzer"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2341,78 +2373,82 @@ msgstr "Proxy Benutzer"
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "Netatalk-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 msgid "inactive"
 msgstr "inaktiv"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 msgid "Not allowed"
 msgstr "Nicht erlaubt"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "Benutzer entfernen"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 msgid "Number of listed users"
 msgstr "Anzahl der angezeigten Benutzer"
 
@@ -2430,7 +2466,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Stärke"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
@@ -2470,7 +2506,8 @@ msgstr "UNIX-Name der Gruppe"
 #: plugins/admin/groups/generic.tpl:65
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
+msgstr ""
+"Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
 #: plugins/admin/groups/generic.tpl:68
 #: plugins/admin/groups/paste_generic.tpl:15
@@ -2504,18 +2541,18 @@ msgstr "Gruppenmitglieder"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -2570,7 +2607,7 @@ msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -2602,8 +2639,8 @@ msgstr "Samba SID"
 msgid "Manage POSIX groups"
 msgstr "POSIX-Gruppen verwalten"
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 msgid "group"
 msgstr "Gruppe"
 
@@ -2614,7 +2651,8 @@ msgstr "Liste der Gruppen"
 
 #: plugins/admin/groups/class_divListGroup.inc:84
 msgid "Select to see groups that are primary groups of users"
-msgstr "Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
+msgstr ""
+"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
 
 #: plugins/admin/groups/class_divListGroup.inc:85
 msgid "primary groups"
@@ -2648,7 +2686,7 @@ msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
 msgid "functional groups"
 msgstr "funktionelle Gruppen"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 msgid "Number of listed groups"
 msgstr "Anzahl der angezeigten Gruppen"
 
@@ -2656,23 +2694,23 @@ msgstr "Anzahl der angezeigten Gruppen"
 msgid "Group settings"
 msgstr "Gruppen-Einstellungen"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 msgid "GOsa settings 2/3"
 msgstr "GOsa-Einstellungen 2/3"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 msgid "Customize special parameters"
 msgstr "Anpassen von Spezialparametern"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "nein"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2751,9 +2789,9 @@ msgstr "Suchen"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Anwenden"
@@ -2761,15 +2799,14 @@ msgstr "Anwenden"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -3083,35 +3120,47 @@ msgstr "Aktiviere Netatalk-Erweiterung für Benutzer"
 msgid "Government mode"
 msgstr "Behörden-Modus"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+msgid "Logging options"
+msgstr "Protokollierungs-Optionen"
+
+#: setup/setup_config2.tpl:186
+msgid "Syslog"
+msgstr "Syslog"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr "MySQL"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "Zustellungs-Methode"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr "Attribut für Kontoidentifikation"
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 msgid "Vacation templates"
 msgstr "Urlaubsvorlagen"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr "Verwenden Cyrus UNIX-Stil"
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 msgid "Snapshots / Undo"
 msgstr "Snapshots / Rückgängig"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 msgid "Enable snapshots"
 msgstr "Snapshots ermöglichen"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 msgid "Snapshot base"
 msgstr "Basis für Snapshots"
 
@@ -3256,12 +3305,6 @@ msgstr ""
 "Seien Sie vorsichtig mit diesem Werkzeug, es könnte Referenzen geben, die "
 "auf diese Arbeitsstationen zeigen, die nicht migriert werden können."
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-msgid "Select all"
-msgstr "Alle auswählen"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3403,23 +3446,23 @@ msgstr ""
 "eine Zahl von Benutzern ändern möchten, wählen Sie sie einfach aus und "
 "drücken Sie den 'Migrieren'-Knopf unterhalb."
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 msgid "LDAP inspection"
 msgstr "LDAP-Inspektion"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr "Untersuche Ihr LDAP-Verzeichnis auf GOsa-Kompatibilität"
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 msgid "Checking for root object"
 msgstr "Prüfe auf Wurzelobjekt"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr "Prüfe Berechtigungen auf die LDAP-Datenbank"
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 msgid "Checking for invisible departments"
 msgstr "Prüfe auf unsichtbare Abteilungen"
 
@@ -3439,45 +3482,45 @@ msgstr "Prüfe auf Benutzer ausserhalb des Benutzerbaums"
 msgid "Checking for groups outside the groups tree"
 msgstr "Prüfe auf Gruppen ausserhalb des Gruppenbaums"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr "Prüfe auf Windows-Arbeitsstationen ausserhalb des Winstation-Baums"
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 msgid "Checking for duplicated UID numbers"
 msgstr "Prüfe auf doppelte UID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 msgid "Checking for duplicate GID numbers"
 msgstr "Prüfe auf doppelte GID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 msgid "LDAP query failed"
 msgstr "LDAP-Abfrage fehlgeschlagen."
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr "Wahrscheinlich fehlt das Wurzelobjekt."
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Es wurden %s doppelte Werte für das Attribute 'uidNumber' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3487,154 +3530,161 @@ msgstr "Es wurden %s doppelte Werte für das Attribute 'uidNumber' gefunden."
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Es wurden %s doppelte Werte für das Attribute 'gidNumber' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
-msgid "Found %s winstations outside the predefined winstation department ou '%s'."
+msgid ""
+"Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 "Es wurden %s Windows-Arbeitsstationen ausserhalb der für diese Abteilung "
 "vordefinierten Winstation Organisationseinheit '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 msgid "Migrate"
 msgstr "Migrieren"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
+msgstr ""
+"Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 msgid "Move"
 msgstr "Verschieben"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
-msgstr "Es wurde(n) %s Benutzer ausserhalb des konfigurierten Baums '%s' gefunden."
+msgstr ""
+"Es wurde(n) %s Benutzer ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
-msgid "The specified user '%s' does not have full access to your ldap database."
-msgstr "Der angegebene Benutzer '%s' hat keinen Vollzugriff auf Ihre LDAP-Datenbank."
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr ""
+"Der angegebene Benutzer '%s' hat keinen Vollzugriff auf Ihre LDAP-Datenbank."
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
-msgstr "Es wurde(n) %s Benutzer gefunden, die in GOsa nicht sichtbar sein werden."
+msgstr ""
+"Es wurde(n) %s Benutzer gefunden, die in GOsa nicht sichtbar sein werden."
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 msgid "Migration error"
 msgstr "Migrationsfehler"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Die Abteilung '%s' kann nicht migriert werden:"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 "Es wurde(n) %s Abteilung(en) gefunden, die nicht in GOsa sichtbar sein "
 "werden."
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr "Es gibt keinen GOsa Administrator in Ihrem LDAP."
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Kann ACL für Benutzer '%s' nicht hinzufügen:"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 msgid "Password error"
 msgstr "Passwortfehler"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 msgid "Provided passwords do not match!"
 msgstr "Die angegebenen Passwörter stimmen nicht überein!"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 msgid "Input error"
 msgstr "Eingabefehler"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 msgid "Specify a valid user ID!"
 msgstr "Geben Sie eine gültige Benutzer ID an!"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 "Hinzufügen eines administrativen Benutzers fehlgeschlagen: Objekt '%s' "
 "existiert bereits!"
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 msgid "Cannot move users to the requested department!"
 msgstr "Kann Benutzer nicht in die geforderte Abteilung verschieben!"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr "Die Windows-Arbeitsstation wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 msgid "to"
 msgstr "an"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr "Aktualisiere ebenfalls die folgenden Referenzen"
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr "Die Gruppe wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr "Der Benutzer wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr "Die folgenden Referenzen werden aktualisiert"
 
-#: setup/class_setupStep_Migrate.inc:1635
-msgid "The LDAP root object is missing. It is required to use your LDAP service."
+#: setup/class_setupStep_Migrate.inc:1651
+msgid ""
+"The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "Das LDAP Wurzelobjekt fehlt. Es wird für den Betrieb des LDAP-Dienstes "
 "benötigt."
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 msgid "Try to create root object"
 msgstr "Versuche, das Wurzelobjekt zu erzeugen"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 "Das Wurzelobjekt konnte nicht erstellt werden, Sie sollten dies manuell "
 "erledigen."
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Kopieren von '%s' nach '%s' fehlgeschlagen:"
@@ -3649,7 +3699,8 @@ msgstr "PHP Modul- und Erweiterungsprüfung"
 
 #: setup/setup_checks.tpl:41 setup/setup_checks.tpl:103
 msgid "GOsa will NOT run without fixing this."
-msgstr "GOsa kann nicht ausgeführt werden, wenn das Problem nicht behoben wird."
+msgstr ""
+"GOsa kann nicht ausgeführt werden, wenn das Problem nicht behoben wird."
 
 #: setup/setup_checks.tpl:45 setup/setup_checks.tpl:107
 msgid "GOsa will run without fixing this."
@@ -3763,7 +3814,8 @@ msgstr "GOsa benötigt dieses Modul um die SSHA-Verschlüsselung zu verwenden."
 
 #: setup/class_setupStep_Checks.inc:105
 msgid "GOsa requires this module to talk to an IMAP server."
-msgstr "GOsa benötigt dieses Modul für die Kommunikation mit einem IMAP-Server."
+msgstr ""
+"GOsa benötigt dieses Modul für die Kommunikation mit einem IMAP-Server."
 
 #: setup/class_setupStep_Checks.inc:112
 msgid "mbstring"
@@ -3773,12 +3825,9 @@ msgstr "mbstring"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr "GOsa benötigt dieses Modul um Unicode-Zeichenketten zu verarbeiten."
 
-#: setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySQL"
-
 #: setup/class_setupStep_Checks.inc:121
-msgid "GOsa requires this module to communicate with several supported databases."
+msgid ""
+"GOsa requires this module to communicate with several supported databases."
 msgstr ""
 "GOsa benötigt dieses Modul, um mit verschiedenen unterstützten Datenbanken "
 "zu kommunizieren."
@@ -3806,7 +3855,8 @@ msgstr ""
 "Passwörter."
 
 #: setup/class_setupStep_Checks.inc:148
-msgid "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
+msgid ""
+"Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 "Nutzen Sie eine GOsa-SI-Installation oder installieren Sie das Perl-Modul "
 "Crypt::SmbHash."
@@ -3878,7 +3928,8 @@ msgstr ""
 "dieser Wert noch vergrössert werden."
 
 #: setup/class_setupStep_Checks.inc:186
-msgid "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'memory_limit' und setzen Sie es auf '32M' "
 "oder höher."
@@ -3902,7 +3953,8 @@ msgid "The Execution time should be at least 30 seconds."
 msgstr "Die Ausführungszeit sollte mindestens 30 Sekunden betragen."
 
 #: setup/class_setupStep_Checks.inc:202
-msgid "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf "
 "'30' oder höher."
@@ -3918,7 +3970,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr "Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
+msgstr ""
+"Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:216
 msgid "On"
@@ -3945,7 +3998,8 @@ msgstr ""
 "stellen."
 
 #: setup/class_setupStep_Checks.inc:226
-msgid "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+msgid ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 "Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen "
 "Sie es auf 'Off'."
@@ -4090,7 +4144,7 @@ msgstr ""
 "Kontingenten bereit. Wählen sie 'dummy', um all Ihre Mail-Einstellungen "
 "unberührt zu lassen."
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 msgid "Setup error"
 msgstr "Einrichtungsfehler"
 
@@ -4098,71 +4152,73 @@ msgstr "Einrichtungsfehler"
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr "UNIX Konten/Gruppen"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 msgid "Samba management"
 msgstr "Samba-Verwaltung"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 msgid "Mailsystem management"
 msgstr "Mailsystem-Verwaltung"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 msgid "FAX system administration"
 msgstr "Faxsystem-Verwaltung"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 msgid "Asterisk administration"
 msgstr "Asterisk-Verwaltung"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 msgid "System inventory"
 msgstr "System-Inventar"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 msgid "System-/Configmanagement"
 msgstr "System-/Konfigurationsverwaltung"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Adressbuch"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 msgid "Notification and feedback"
 msgstr "Benachrichtigung und Rückmeldung"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 msgid "Get notifications or send feedback"
 msgstr "Erhalte Benachrichtungen oder sende Rückmeldung"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr "Fehler beim Rückmelden"
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr "Kann Rückmeldung nicht an '%s' senden: %s"
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
-msgstr "Kann Rückmeldung nicht senden: Der Dienst ist vorübergehend nicht verfügbar"
+msgstr ""
+"Kann Rückmeldung nicht senden: Der Dienst ist vorübergehend nicht verfügbar"
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr "Feedback erfolgreich gesendet"
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 msgid "Please specify a valid email address."
 msgstr "Bitte geben Sie eine gültige E-Mail-Adresse ein."
 
-#: setup/class_setupStep_Feedback.inc:185
-msgid "You have to select at least one of both options, subscribe or send feedback."
+#: setup/class_setupStep_Feedback.inc:184
+msgid ""
+"You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
 "Sie müssen mindestens eine der beiden Optionen auswählen, Abonnement der "
 "Mailingliste oder Senden einer Rückmeldung."
@@ -4251,7 +4307,8 @@ msgstr "Welche Funktionen von GOsa verwenden Sie?"
 
 #: setup/setup_feedback.tpl:136
 msgid "What features do you want to see in future versions of GOsa?"
-msgstr "Welche Funktionen würden Sie gerne in zukünftigen Versionen von GOsa sehen?"
+msgstr ""
+"Welche Funktionen würden Sie gerne in zukünftigen Versionen von GOsa sehen?"
 
 #: setup/setup_feedback.tpl:143
 msgid "Send feedback"
@@ -4284,7 +4341,7 @@ msgstr ""
 "Sie sicher, dass niemand wichtige Änderungen vorgenommen hat, die verloren "
 "gehen, wenn Sie diesen Eintrag speichern!"
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -4293,11 +4350,11 @@ msgstr ""
 "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
 "s' ist nicht gesetzt."
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr "Ändere ACL dn"
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "from"
 msgstr "von"
 
@@ -4324,12 +4381,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' ist kein gültiges LDAP-Objekt"
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -4343,12 +4400,12 @@ msgstr "Keine Schreibberechtigung in '%s'"
 msgid "These objects will be pasted: %s"
 msgstr "Diese Objekte werden eingefügt: %s"
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Dieses Objekt wird eingefügt: %s"
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
@@ -4498,7 +4555,8 @@ msgstr "Das Feld '%s' enthält ein reserviertes Schlüsselwort!"
 #: include/utils/class_msgPool.inc:200
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr "Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
+msgstr ""
+"Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
 
 #: include/utils/class_msgPool.inc:207
 #, php-format
@@ -4606,7 +4664,6 @@ msgstr "Fehlenden %s PHP-Erweiterung!"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Speichern"
@@ -4652,7 +4709,8 @@ msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 
 #: include/utils/class_msgPool.inc:381
 #, php-format
-msgid "This account has %s settings enabled. You can disable them by clicking below."
+msgid ""
+"This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
@@ -4668,7 +4726,8 @@ msgstr ""
 
 #: include/utils/class_msgPool.inc:400
 #, php-format
-msgid "This account has %s settings disabled. You can enable them by clicking below."
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
 "einen Klick auf die Schaltfläche aktivieren."
@@ -4839,47 +4898,52 @@ msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieses Objekts: %s"
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, php-format
+msgid "This '%s' is still in use."
+msgstr "Dieses '%s' ist noch in Benutzung."
+
+#: include/utils/class_msgPool.inc:499
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieser Objekte: %s"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
@@ -4898,43 +4962,49 @@ msgid "Please fix the above error and reload the page."
 msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Wurzel"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Heimat"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr "Inkonsistente Enkodierung der DN erkannt: '%s'"
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr "Stelle Abzüge von bereits entfernten Objekten her"
 
@@ -4948,7 +5018,13 @@ msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
-msgstr "Das mcrypt-Modul wurde nicht gefunden. Bitte installieren Sie php5-mcrypt."
+msgstr ""
+"Das mcrypt-Modul wurde nicht gefunden. Bitte installieren Sie php5-mcrypt."
+
+#: include/class_socketClient.inc:108
+#, fuzzy, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr "Die Verbidung zum Host '%s:%s' ist fehlgeschlagen: %s"
 
 #: include/class_socketClient.inc:191
 #, php-format
@@ -4966,29 +5042,31 @@ msgstr ""
 "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f "
 "Sekunden!"
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
-msgid "Cannot automatically create subtrees with RDN '%s': no object class found!"
+msgid ""
+"Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: keine Objektklasse "
 "gefunden!"
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: nicht unterstützt"
+msgstr ""
+"Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: nicht unterstützt"
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -4997,29 +5075,41 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
 "Zeile %s!"
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "SID und/oder RIDBASE fehlen in der Konfiguration!"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+"Die von Ihnen verwendete Konfigurationsdatei scheint veraltet zu sein. Bitte "
+"entfernen Sie diese Datei und starten Sie das GOsa-Setup."
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 "Es konnte keine passende Passwort-Methode für den aktuellen Hash gefunden "
@@ -5029,16 +5119,16 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr "GOsa support daemon"
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 msgid "Cannot not parse XML!"
 msgstr "XML-Nachricht kann nicht ausgewertet werden!"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Kann keine Abbruch-Nachricht für den Eintrag %s versenden!"
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Kann Eintrag %s nicht entfernen!"
@@ -5055,15 +5145,44 @@ msgstr "Passwort Rücksetzung"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "Das Nutzer-Passwort wurde zurückgesetzt, bitte setzen Sie ein Neues!"
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Referenzen"
 
+#: include/class_baseSelectDialog.inc:44
+msgid "Choose a base"
+msgstr "Wählen Sie eine Basis"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Benutzer"
+
+#: include/class_baseSelectDialog.inc:66
+#, fuzzy
+msgid "Action"
+msgstr "Aktionen"
+
+#: include/class_baseSelectDialog.inc:72
+msgid "Filter entries with this syntax"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Wählen Sie eine Basis"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5091,61 +5210,61 @@ msgstr "%s Ergebnisse für Ihre Suche nach %s"
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% Trefferquote in Datei %s"
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr "Sende Fehlerbericht an das GOsa Team"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr "Fehlerbericht senden"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "PHP Fehler"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "Klasse"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "Funktion"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "statisch"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "Methode"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr "Ablaufverfolgung"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr "Datei"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr "Zeile"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Typ"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "Argumente"
 
@@ -5153,14 +5272,14 @@ msgstr "Argumente"
 msgid "All objects in this category"
 msgstr "Keine Objekte dieser Kategorie"
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 "Das Konfigurationsformat hat sich geändert. Bitte durchlaufen Sie erneut die "
 "Einrichtung!"
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -5185,7 +5304,8 @@ msgstr "MySQL-Fehler"
 
 #: include/class_log.inc:107
 msgid "Logging to MySQL database will be disabled for this session!"
-msgstr "Protokollierung in die MySQL-Datenkbank wird für diese Sitzung abgeschaltet!"
+msgstr ""
+"Protokollierung in die MySQL-Datenkbank wird für diese Sitzung abgeschaltet!"
 
 #: include/class_log.inc:120
 #, php-format
@@ -5207,30 +5327,32 @@ msgstr "MySQL Protokollierung"
 msgid "Cannot add location to the database!"
 msgstr "Kann Standort nicht in die Datenbank einfügen!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' "
 "aus, um das Problem zu beheben"
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
-msgid "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%"
 "s' aus um das Problem zu beheben"
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
+msgstr ""
+"FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum."
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -5238,11 +5360,12 @@ msgstr ""
 "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte "
 "kontaktieren Sie Ihren Administrator."
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
-msgstr "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
+msgstr ""
+"Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5251,12 +5374,12 @@ msgstr ""
 "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
 "Ihren Administrator!"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -5264,12 +5387,12 @@ msgstr ""
 "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
 "passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5278,69 +5401,69 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Die Datei '%s' konnte nicht entfernt werden."
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr "'base_hook' ist nicht verfügbar. Verwende die Standard-Basis!"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung "
 "möglich!"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr "Verwendet, um kontenbezogene Informationen zu speichern."
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -5348,32 +5471,32 @@ msgstr ""
 "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um "
 "gleichzeitige Änderungen zu verhindern)."
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Die benötigte Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Die optionale Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Falsche·Version·der·benötigten·Objektklasse·'%s'·(!=%s)!"
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr "Falsche Version der optionalen Objektklasse '%s' (!=%s)!"
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -5381,7 +5504,7 @@ msgstr ""
 "Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre "
 "Schema-Konfiguration unterstützt dies nicht."
 
-#: include/functions.inc:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -5389,7 +5512,7 @@ msgstr ""
 "Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse "
 "'posixGroup' AUXILIARY sein"
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -5397,58 +5520,59 @@ msgstr ""
 "Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie "
 "haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
 
-#: include/functions.inc:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "Die Objektklasse 'posixGroup' muss STRUCTURAL sein"
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Deutsch"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Französisch"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "Italienisch"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Englisch"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr "Polnisch"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr "Kann Samba-Hash nicht erzeugen!"
 
@@ -5456,117 +5580,119 @@ msgstr "Kann Samba-Hash nicht erzeugen!"
 msgid "Access control"
 msgstr "Zugriffskontrolle"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr "ACLs zurücksetzen"
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 msgid "No ACL settings for this category!"
 msgstr "Keine ACL-Einstellungen für diese Kategorie!"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Enthält ACLs für diese Objekte: %s"
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 msgid "category ACL"
 msgstr "ACL Kategorie"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "ACL für '%s' bearbeiten - Gültigkeitsbereich ist '%s'"
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 msgid "Show/hide advanced settings"
 msgstr "Zeige/verstecke erweiterte Einstellungen"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr "Änderbar vom Eigentümer"
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 msgid "Move object"
 msgstr "Objekt verschieben"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 msgid "Remove object"
 msgstr "Objekt entfernen"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "lesen"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "schreiben"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 msgid "Complete object"
 msgstr "Vollständiges Objekt"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Unbekannter ACL-Typ '%s'!"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Unbekannter Eintrag '%s'!"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, php-format
 msgid "Role: %s"
 msgstr "Rolle: %s"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 msgid "unknown role"
 msgstr "unbekannte rolle"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "Mitglieder"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr "ACL wirkt für alle Benutzer"
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 msgid "Access control list"
 msgstr "Zugriffskontrollliste"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 msgid "ACL roles"
 msgstr "ACL-Rollen"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 msgid "Role name"
 msgstr "Rollenname"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 msgid "Role description"
 msgstr "Rollenbeschreibung"
 
@@ -5580,7 +5706,8 @@ msgstr "Zertifikat kann nicht geladen werden - nur PEM/DER sind unterstützt!"
 
 #: include/class_certificate.inc:115
 msgid "Cannot extract information for non PEM certificates!"
-msgstr "Zertifikatinformationen können nur für PEM Zertifikate ermittelt werden!"
+msgstr ""
+"Zertifikatinformationen können nur für PEM Zertifikate ermittelt werden!"
 
 #: include/class_certificate.inc:219
 msgid "No valid certificate loaded!"
@@ -5638,27 +5765,32 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Erneut anmelden"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Zusätzliche GOsa-Einstellungen"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr "Verwende Mitglieder von"
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr "Verfügbare Mitglieder"
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr "Zeige mögliche Empfänger dieser Nachricht"
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr "Zeige Nachrichtenempfänger"
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 msgid "ACL for this object"
 msgstr "ACL für dieses Objekt"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 msgid "Available roles"
 msgstr "Verfügbare Rollen"
 
@@ -5763,7 +5895,8 @@ msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
 
 #: ihtml/themes/default/sizelimit.tpl:9
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
+msgstr ""
+"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
 
 #: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
@@ -5941,70 +6074,18 @@ msgstr "Neues Passwort (Wiederholung)"
 msgid "Change"
 msgstr "Ändern"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-msgid "Heimdal options"
-msgstr "Heimdal-Einstellungen"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr "Verwende leere Werte für unendlich"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr "Maximale Lebenszeit des Tickets"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr "Maximale Anzahl von Verlängerungen des Tickets"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr "unendlich"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-msgid "Hour"
-msgstr "Stunde"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-msgid "Minute"
-msgstr "Minute"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-msgid "Day"
-msgstr "Tag"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-msgid "Month"
-msgstr "Monat"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-msgid "Year"
-msgstr "Jahr"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr "Gültigkeitsbeginn des Tickets"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr "Gültigkeitsende des Tickets"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-msgid "Password end"
-msgstr "Ende der Gültigkeit des Passworts"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu "
 "beseitigen"
 
-#: html/main.php:171
+#: html/main.php:172
 msgid "PHP configuration"
 msgstr "PHP-Konfiguration"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
@@ -6012,19 +6093,23 @@ msgstr ""
 "FATAL: 'Register globals' ist im PHP aktiviert. GOsa läßt keine Anmeldung "
 "zu, bis dies von einem Administrator behoben wurde."
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr "Der verfügbare Arbeitsspeicher wird knapp!"
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ihr Passwort ist fast abgelaufen, bitte setzen Sie ein neues!"
 
-#: html/main.php:365
+#: html/main.php:370
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/main.php:366
+#: html/main.php:371
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: Es kann kein Plugin für die Definition '%s' gefunden werden!"
@@ -6041,79 +6126,80 @@ msgstr ""
 "Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer gosa.conf wird "
 "von der Einstellung in der php.ini überschrieben."
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "Die GOsa-Konfigurationsdatei %s/%s ist nicht lesbar. Abgebrochen."
 
-#: html/index.php:166
+#: html/index.php:167
 msgid "Smarty error"
 msgstr "Smarty-Fehler"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr "Es gab ein Problem mit der Authentisierungseinrichtung!"
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 "Es konnte kein gültiger Benutzer für die aktuell eingerichtete "
 "Authentisierung gefunden werden!"
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 "Die Benutzerinformation ist für die konfigurierten LDAP-Bäume nicht "
 "eindeutig!"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr "Kann Information über das installierte LDAP-Schema nicht ermitteln!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Ihre LDAP-Einrichtung enthält veraltete Schema-Definitionen:"
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr "Konnte Benutzerinformation für htaccess-Authentisierung nicht beziehen!"
+msgstr ""
+"Konnte Benutzerinformation für htaccess-Authentisierung nicht beziehen!"
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:374
+#: html/index.php:375
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6152,3 +6238,10 @@ msgstr ""
 msgid "Smarty"
 msgstr "Smarty"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Wiederherstellen"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Verzeichnis"

diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
index 62441e44f014b92d833fbd708bcbc9c8f3bd1c7c..fa5d6b9f80645ff49867ac00568d5f7a35b1e518 100644 (file)
--- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2007-07-24 00:26+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <es@li.org>\n"
@@ -58,7 +58,7 @@ msgstr ""
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -90,8 +90,8 @@ msgid "Clear fields"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -110,9 +110,10 @@ msgstr "Cambiar contraseña"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "Contraseña"
@@ -123,7 +124,7 @@ msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -161,12 +162,12 @@ msgid "You have no permission to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 msgid "User password"
 msgstr "Contraseña del usuario"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Mi cuenta"
@@ -187,11 +188,11 @@ msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -202,27 +203,27 @@ msgstr "Genérico"
 msgid "Edit organizational user settings"
 msgstr "Parámetros administrativos"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -233,29 +234,29 @@ msgstr "hombre"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:543
+#: plugins/personal/generic/class_user.inc:548
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -263,35 +264,35 @@ msgstr ""
 "(Algunos tipos de certificados no están soportados y pueden ser mostrados "
 "como no validos.)"
 
-#: plugins/personal/generic/class_user.inc:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "El certificado es valido desde %s hasta %s y es actualmente %s."
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "no válido"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Contraseña"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "La aplicación ya no está disponible."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -301,59 +302,64 @@ msgstr "La aplicación ya no está disponible."
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "Servicio LDAP"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "La aplicación ya no está disponible."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -366,137 +372,137 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Nombre de pila"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado especificado!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última dirección conocida"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lugar de residencia"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de desarrollo"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Función"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible por todos"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -504,22 +510,22 @@ msgstr "Calle"
 msgid "Role"
 msgstr "Rol"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -529,89 +535,90 @@ msgstr "Usuarios"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Base"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Apellidos"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Títulos académicos"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Gender"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Funciones laborales"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -619,44 +626,44 @@ msgstr "Funciones laborales"
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Provincia"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 msgid "Fax number"
 msgstr "Número de Fax"
 
@@ -729,7 +736,7 @@ msgid "Select a base"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -747,44 +754,44 @@ msgstr ""
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -798,7 +805,7 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Eliminar"
@@ -848,6 +855,7 @@ msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -880,21 +888,25 @@ msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que coincidan con"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr ""
@@ -973,17 +985,18 @@ msgstr "Mostrar grupos de correo"
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr ""
 
@@ -1003,7 +1016,7 @@ msgstr "Periodo de gracia activado"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "activo"
 
@@ -1033,17 +1046,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Entorno"
@@ -1072,16 +1085,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de que la contraseña expire"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "desactivado"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
@@ -1091,19 +1107,18 @@ msgstr "Permitir el acceso a estos equipos"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Aviso"
@@ -1216,7 +1231,7 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1231,66 +1246,65 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Impresora"
 
@@ -1326,7 +1340,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Administración de departamento"
 
@@ -1420,6 +1434,16 @@ msgstr ""
 msgid "List of departments"
 msgstr "Lista de Departamentos"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+msgid "Select all"
+msgstr ""
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1432,7 +1456,7 @@ msgstr "Nombre de departamento"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1445,7 +1469,7 @@ msgstr "Expresión regular para buscar el nombre del departamento"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Enviar departamento"
@@ -1453,18 +1477,19 @@ msgstr "Enviar departamento"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "Enviar"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Crear"
 
@@ -1472,14 +1497,14 @@ msgstr "Crear"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "editar"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
@@ -1487,14 +1512,14 @@ msgstr "Editar esta entrada"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "eliminar"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Eliminar esta entrada"
 
@@ -1504,8 +1529,8 @@ msgstr "departamento"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Eliminar departamentos seleccionados"
@@ -1530,7 +1555,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1561,9 +1586,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "Moviendo '%s' a '%s'"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Objeto"
@@ -1607,40 +1632,40 @@ msgstr ""
 msgid "Manage Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Permisos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Ha decidido eliminar todo el subárbol LDAP colocado debajo de '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1648,14 +1673,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "ACL"
 
@@ -1680,7 +1704,6 @@ msgid "List of acls"
 msgstr "Lista de acls"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "Sumario"
 
@@ -1690,7 +1713,7 @@ msgstr "Mostrar las acl que coincidan con"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1698,7 +1721,7 @@ msgstr "copiar"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1708,39 +1731,39 @@ msgstr "mover"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "mover"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "copiar"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
@@ -1772,7 +1795,7 @@ msgstr "Lista de control de acceso"
 msgid "Edit AC roles"
 msgstr "Rol"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 msgid "All categories"
 msgstr "Todas las categorías"
 
@@ -1781,44 +1804,45 @@ msgstr "Todas las categorías"
 msgid "Reset ACL"
 msgstr "Eliminar ACLs"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr "Un nivel"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "Arriba"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "Abajo"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Editar"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1847,7 +1871,7 @@ msgstr "Categoría"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
@@ -1876,25 +1900,26 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 msgid "New ACL"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 msgid "ACL type"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 msgid "Select an acl type"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 msgid "List of available ACL categories"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr ""
 
@@ -1903,31 +1928,31 @@ msgstr ""
 msgid "Manage object groups"
 msgstr "Mostrar los grupos samba"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Buscar en subárboles"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Mostrar los grupos samba"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Windows RDP"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -1957,7 +1982,7 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr ""
 
@@ -1967,15 +1992,15 @@ msgid "List of object groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2056,8 +2081,7 @@ msgstr "Mostrar los grupos samba"
 msgid "Number of listed object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2065,122 +2089,131 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Rol"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "Impresora"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 msgid "Member"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Inicio"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+#, fuzzy
+msgid "FAI summary"
+msgstr "Sumario"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Aplicaciones"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr ""
 
@@ -2214,48 +2247,37 @@ msgstr ""
 msgid "Manage users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "No tiene permisos para mover este objeto a '%s'."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "No tiene permisos para mover este objeto a '%s'."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:564
-#, fuzzy
-msgid "Delete users"
-msgstr "Eliminar usuario"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "Eliminar usuario"
-
-#: plugins/admin/users/class_userManagement.inc:701
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "User successfully removed."
-msgstr "Sugerencia enviada correctamente"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Plantilla"
 
@@ -2285,7 +2307,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Administración de Usuario"
 
@@ -2323,7 +2345,7 @@ msgid "functional users"
 msgstr "Mostrar usuarios funcionales"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2353,80 +2375,84 @@ msgstr "Mostrar los usuarios de proxy"
 msgid "Display users matching"
 msgstr "Mostrar usuarios que coincidan con"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "Editar características generales"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "Editar características UNIX"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "Editar características de entorno"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "Editar características de correo electrónico"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "Editar características telefónicas"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "Editar características de Fax"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "Editar características samba"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "Editar características netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "Crear usuario desde plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "Crear usuario con esta plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "activo"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "contraseña"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 msgid "Not allowed"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "Eliminar usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 msgid "Number of listed users"
 msgstr ""
 
@@ -2442,7 +2468,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Calle"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Administración de grupo"
 
@@ -2514,18 +2540,18 @@ msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "Se puede escribir en la configuración"
@@ -2580,7 +2606,7 @@ msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Grupos"
 
@@ -2612,8 +2638,8 @@ msgstr "Samba SID"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "Grupo"
@@ -2666,7 +2692,7 @@ msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
 msgid "functional groups"
 msgstr "Mostrar grupos funcionales"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Eliminar grupo seleccionado"
@@ -2675,23 +2701,23 @@ msgstr "Eliminar grupo seleccionado"
 msgid "Group settings"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 msgid "GOsa settings 2/3"
 msgstr "Configuración GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 msgid "Customize special parameters"
 msgstr "Personalizar parametros especiales"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "No"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2772,9 +2798,9 @@ msgstr ""
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Aplicar"
@@ -2782,15 +2808,14 @@ msgstr "Aplicar"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -3115,35 +3140,49 @@ msgstr ""
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "¡id desconocido!"
+
+#: setup/setup_config2.tpl:186
+msgid "Syslog"
+msgstr ""
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Servicio LDAP"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "Parámetros de correo"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 msgid "Snapshot base"
 msgstr ""
 
@@ -3271,12 +3310,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-msgid "Select all"
-msgstr ""
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3395,23 +3428,23 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr "Analice la compatibilidad con GOsa de su directorio LDAP"
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 msgid "Checking for root object"
 msgstr "Comprobando objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
@@ -3432,49 +3465,49 @@ msgstr "Comprobando cuentas fuera del árbol de usuarios"
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 "Comprobando estaciones de trabajo windows fuera del árbol de estaciones de "
 "trabajo windows"
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números uid duplicados"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Comprobando números uid duplicados"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr "Posiblemente el objeto raíz está desaparecido"
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3484,19 +3517,19 @@ msgstr "Encontrado '%s' valores duplicados del atributo 'uidNumber'."
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
@@ -3504,140 +3537,140 @@ msgstr ""
 "Se encontraron '%s' estaciones de trabajo windows fuera del contenedor ou de "
 "estaciones de trabajo windows '%s'"
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 msgid "Move"
 msgstr "Mover"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Encontrados '%s' usuario(s) fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 "El usuario especificado '%s' no tiene acceso total a la base de datos LDAP."
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr "Encontrados %s usuario(s) que nos son visibles para GOsa."
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Crear nuevo departamento"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr "Encontrados %s departamento(s) que nos son visibles para GOsa."
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr "No hay cuenta de administrador GOsa en la base de datos LDAP."
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "La contraseña expira en"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr ""
 "¡La contraseñas introducidas como nueva y repita nueva contraseña no "
 "coinciden!"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Por favor especifique un uid valido."
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "No puedo mover los usuarios al departamento especificado."
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr "La estaciones de trabajo windows serán trasladadas desde"
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr "También se actualizaran las siguientes referencias"
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr "El grupo serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr "El usuario serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "EL objeto raíz de LDAP ha desaparecido. Es necesario para poder usar el "
 "servicio LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 msgid "Try to create root object"
 msgstr "Intentando crear el objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 "El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Moviendo '%s' a '%s'"
@@ -3777,11 +3810,6 @@ msgstr "Parametros de samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Servicio LDAP"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4066,7 +4094,7 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 msgid "Setup error"
 msgstr ""
 
@@ -4074,73 +4102,73 @@ msgstr ""
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr "Cuentas/Grupos UNIX"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 msgid "Samba management"
 msgstr "Administración Samba"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 msgid "Mailsystem management"
 msgstr "Administración sistema de correo"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 msgid "FAX system administration"
 msgstr "Administración sistema de FAX"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 msgid "Asterisk administration"
 msgstr "Administración Asterisk"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 msgid "System inventory"
 msgstr "Inventario de sistemas"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 msgid "System-/Configmanagement"
 msgstr "Sistemas-/Administración de Configuraciones"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Libreta direcciones"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 msgid "Notification and feedback"
 msgstr "Avisos y sugerencias"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 msgid "Get notifications or send feedback"
 msgstr "Recibir avisos o enviar sugerencias"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 #, fuzzy
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 "Error mientras se envía su sugerencia. Es posible que el servicio no se "
 "encuentre disponible"
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr "Sugerencia enviada correctamente"
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 msgid "Please specify a valid email address."
 msgstr "Por favor indique una dirección de correo válida."
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 #, fuzzy
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
@@ -4257,18 +4285,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "from"
 msgstr ""
 
@@ -4295,12 +4323,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Insertar separador"
@@ -4315,12 +4343,12 @@ msgstr ""
 msgid "These objects will be pasted: %s"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "¡No puedo abrir el certificado especificado!"
@@ -4599,7 +4627,6 @@ msgstr "Eliminar extensión de impresión"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Guardar"
@@ -4839,50 +4866,57 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr ""
+"Este Rol no puede ser eliminado por estar siendo usado. Los siguientes "
+"objetos están usando este rol %s"
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 "Este Rol no puede ser eliminado por estar siendo usado. Los siguientes "
 "objetos están usando este rol %s"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "No se puede grabar el archivo '%s'."
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "No se puede grabar el archivo '%s'."
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 "La Autenticación como usuario '%s' en el servidor '%s'. ha tenido éxito."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Crear nuevo departamento"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Crear nuevo departamento"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte mhash"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -4899,43 +4933,49 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Raíz"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Ir al departamento de usuarios"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Inicio"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 msgid "Restore"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -4951,6 +4991,11 @@ msgstr ""
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -4965,53 +5010,64 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "Se puede escribir en la configuración"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5019,17 +5075,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "¡Demasiados usuarios!, no hay identificadores (ID) libres"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -5047,15 +5103,44 @@ msgstr "La contraseña expira en"
 msgid "The user password was resetted, please set a new password value!"
 msgstr ""
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr ""
 
+#: include/class_baseSelectDialog.inc:44
+msgid "Choose a base"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Usuario"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Acción"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Entradas de filtrado con esta sintaxis"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Eliminar esta entrada"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5083,59 +5168,59 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Tipo"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr ""
 
@@ -5143,12 +5228,12 @@ msgstr ""
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr ""
 
@@ -5196,230 +5281,230 @@ msgid "Cannot add location to the database!"
 msgstr ""
 "La Autenticación como usuario '%s' en el servidor '%s'. ha tenido éxito."
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido eliminar las siguientes entradas %s"
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Aviso"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Francés"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Inglés"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 msgid "Chinese"
 msgstr "Chino"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Ruso"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5427,120 +5512,122 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "Categoría"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, fuzzy, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 msgid "Move object"
 msgstr ""
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 msgid "Remove object"
 msgstr ""
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "leer"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "escribir"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "¡id desconocido!"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 msgid "Access control list"
 msgstr "Lista de control de acceso"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 msgid "ACL roles"
 msgstr "Rol"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 msgid "Role name"
 msgstr "Nombre del Rol"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 msgid "Role description"
 msgstr "Descripción del Rol"
 
@@ -5611,28 +5698,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Eliminar opciones"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 msgid "Available roles"
 msgstr ""
 
@@ -5867,93 +5959,40 @@ msgstr "activo, la contraseña expiró"
 msgid "Change"
 msgstr "Cancelar"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "Eliminar opciones"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-msgid "Hour"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Impresora"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "Mayo"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "mes"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-msgid "Year"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Contraseña"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "Escribir archivo de configuración"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: html/main.php:365
+#: html/main.php:370
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:366
+#: html/main.php:371
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
@@ -5968,75 +6007,75 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Insertar separador"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Tipo de autentificación IAX"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:374
+#: html/index.php:375
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6072,6 +6111,34 @@ msgstr ""
 msgid "Smarty"
 msgstr "Sumario"
 
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Eliminar usuario"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "Sugerencia enviada correctamente"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "Eliminar opciones"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Impresora"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "Mayo"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "mes"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Contraseña"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Parámetro de la aplicación"
@@ -6116,10 +6183,6 @@ msgstr "Sumario"
 #~ msgid "sudo role"
 #~ msgstr "¡id desconocido!"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "¡id desconocido!"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "Aviso"
@@ -6140,18 +6203,10 @@ msgstr "Sumario"
 #~ msgid "Run as user"
 #~ msgstr "Usuarios del dominio"
 
-#, fuzzy
-#~ msgid "Available options"
-#~ msgstr "Eliminar opciones"
-
 #, fuzzy
 #~ msgid "Sudo role administration"
 #~ msgstr "Administración de grupo"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Se puede escribir en la configuración"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Administración sistema de correo"
@@ -6374,9 +6429,6 @@ msgstr "Sumario"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
 
-#~ msgid "Applications"
-#~ msgstr "Aplicaciones"
-
 #, fuzzy
 #~ msgid "Phones"
 #~ msgstr "Teléfono"
@@ -6859,9 +6911,6 @@ msgstr "Sumario"
 #~ msgid "Schedule"
 #~ msgstr "PHP Schedule it"
 
-#~ msgid "Action"
-#~ msgstr "Acción"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Eliminar"
@@ -6941,7 +6990,3 @@ msgstr "Sumario"
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "servicio de registro de GOsa"
-
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Entradas de filtrado con esta sintaxis"

diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index 940c8a3bf386fee4bd8684f49becc3c27d9a72a1..12ab7c2874f972113f90dc3b12cd7148491e32ee 100644 (file)
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2007-07-19 11:57+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -62,7 +62,7 @@ msgstr "Mot de passe actuel"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -94,8 +94,8 @@ msgid "Clear fields"
 msgstr "Effacer les données dans les champs"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -114,9 +114,10 @@ msgstr "Modifier votre mot de passe"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 msgid "Password change"
 msgstr "Changement de mot de passe"
 
@@ -126,7 +127,7 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -167,12 +168,12 @@ msgid "You have no permission to change your password."
 msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 msgid "User password"
 msgstr "Mot de passe"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Mon Compte"
@@ -193,11 +194,11 @@ msgid "Remove picture"
 msgstr "Suppression de l'image personnelle"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -208,27 +209,27 @@ msgstr "Informations"
 msgid "Edit organizational user settings"
 msgstr "Paramètres supplémentaire de GOsa"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "féminin"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "masculin"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -239,29 +240,29 @@ msgstr "masculin"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr "Erreur"
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:543
+#: plugins/personal/generic/class_user.inc:548
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -269,35 +270,35 @@ msgstr ""
 "(Certains types de certificats ne sont pas supportés et peuvent être "
 "affichés comme 'non valides'.)"
 
-#: plugins/personal/generic/class_user.inc:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Le certificat est valide de %s à %s et est actuellement %s."
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "valide"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "invalide"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "L'application sélectionnée n'est plus disponible."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -307,59 +308,64 @@ msgstr "L'application sélectionnée n'est plus disponible."
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "Erreur LDAP :"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "L'application sélectionnée n'est plus disponible."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Identifiant"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -372,137 +378,137 @@ msgstr "Identifiant"
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Prénom"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Téléphone"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat demandé !"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -510,22 +516,22 @@ msgstr "Rue"
 msgid "Role"
 msgstr "Rôle"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -535,89 +541,90 @@ msgstr "Utilisateurs"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Base"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Entreprise"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Gender"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -625,44 +632,44 @@ msgstr "Type de l'employé"
 msgid "Location"
 msgstr "Lieu"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "Adresse postale"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 msgid "Fax number"
 msgstr "Numéro de fax"
 
@@ -735,7 +742,7 @@ msgid "Select a base"
 msgstr "Sélectionnez une base"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -753,44 +760,44 @@ msgstr "Numéro de téléphone privé"
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Configurer"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Editer des certificats"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
@@ -804,7 +811,7 @@ msgstr "Certificat standard"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Supprimer"
@@ -857,6 +864,7 @@ msgstr "Afficher les groupes du département"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -889,21 +897,25 @@ msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Sélectionner les hôtes à ajouter"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Afficher les systèmes du département"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Afficher les systèmes correspondant"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Expression régulière pour sélectionner les adresses correspondantes"
@@ -982,17 +994,18 @@ msgstr "Afficher les groupes ayant la messagerie activé"
 msgid "Account"
 msgstr "Compte"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "Système de Confiance"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "UNIX"
 
@@ -1012,7 +1025,7 @@ msgstr "temps de grâce activé"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "actif"
 
@@ -1042,17 +1055,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Environnement"
@@ -1082,16 +1095,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "désactivé"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "accès complet"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
@@ -1101,19 +1117,18 @@ msgstr "permettre l'accès a ces hôtes"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Avertissement"
@@ -1225,7 +1240,7 @@ msgstr "Nom de l'objet"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1240,66 +1255,65 @@ msgstr "Contenu"
 msgid "This object has no relationship to other objects."
 msgstr "Cette objet n'a pas de relation avec d'autres objets."
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Messagerie"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Groupes"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Applications"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Serveur"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "Clients légers"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Groupes d'objets"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Imprimante"
 
@@ -1341,7 +1355,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Gestion des départements"
 
@@ -1445,6 +1459,16 @@ msgstr "Marquer le département comme une entité administrative indépendante"
 msgid "List of departments"
 msgstr "Liste des départements"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+msgid "Select all"
+msgstr "Sélectionner tout"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1457,7 +1481,7 @@ msgstr "Nom du département"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1470,7 +1494,7 @@ msgstr "Expression régulière pour faire correspondre les départements"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Soumettre le département"
@@ -1478,18 +1502,19 @@ msgstr "Soumettre le département"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "Soumettre"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Créer"
 
@@ -1497,14 +1522,14 @@ msgstr "Créer"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "éditer"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
@@ -1512,14 +1537,14 @@ msgstr "Editer cette entrée"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "supprimer"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
@@ -1529,8 +1554,8 @@ msgstr "département"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Nom du département"
@@ -1559,7 +1584,7 @@ msgstr ""
 "Avant de confirmer cette action, vérifiez que tout se passera comme prévu, "
 "la meilleure solution est probablement une sauvegarde."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1590,9 +1615,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Objet"
@@ -1636,42 +1661,42 @@ msgstr "Suppression de la marque de l'objet '%s'"
 msgid "Manage Departments"
 msgstr "Départements"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Permissions"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer la branche complète de l'annuaire LDAP "
 "placé sous '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1679,14 +1704,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr ""
 
@@ -1714,7 +1738,6 @@ msgid "List of acls"
 msgstr "Liste des acls"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "Sommaire"
 
@@ -1724,7 +1747,7 @@ msgstr "Afficher les acls correspondantes"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1732,7 +1755,7 @@ msgstr "copier"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1742,39 +1765,39 @@ msgstr "couper"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr "Coller"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "couper"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "copier"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
@@ -1806,7 +1829,7 @@ msgstr "Contrôle d'accès (ACL)"
 msgid "Edit AC roles"
 msgstr "Rôles ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 msgid "All categories"
 msgstr "Toutes les catégories"
 
@@ -1815,44 +1838,45 @@ msgstr "Toutes les catégories"
 msgid "Reset ACL"
 msgstr "Remise à zéro des ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr "Un niveau"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 msgid "Current object"
 msgstr "Objet actuel"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 msgid "Complete subtree"
 msgstr "Sous arbre complet"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr "Le sous arbre complet (permanent)"
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "Au dessus"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "En bas"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Editer"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
@@ -1881,7 +1905,7 @@ msgstr "Catégorie"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr "Tout les objets dans le sous arbres actuel"
 
@@ -1911,25 +1935,26 @@ msgstr "ACL assignés à l'entrée actuelle"
 msgid "Choose subtree to place group in"
 msgstr "Sélectionnez la branche où sera placée le groupe"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 msgid "New ACL"
 msgstr "Nouvel ACL"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 msgid "ACL type"
 msgstr "Type ACL"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 msgid "Select an acl type"
 msgstr "Sélectionnez un type d'acl"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 msgid "List of available ACL categories"
 msgstr "Liste des catégories d'acl disponibles"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -1938,31 +1963,31 @@ msgstr "Groupes d'objets"
 msgid "Manage object groups"
 msgstr "Nom du groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Fenêtre de connexion GOsa"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Utilisateur"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Station de travail Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -1997,7 +2022,7 @@ msgstr "Nom du groupe"
 msgid "Descriptive text for this group"
 msgstr "Description du groupe"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Objets membres"
 
@@ -2007,15 +2032,15 @@ msgid "List of object groups"
 msgstr "Liste des groupes d'objets"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2097,8 +2122,7 @@ msgstr "Afficher les groupes"
 msgid "Number of listed object groups"
 msgstr "Nom du groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2106,123 +2130,132 @@ msgstr "Nom du groupe d'objets"
 msgid "Information"
 msgstr "Information"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "départements"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Afficher les utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "groupes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "applications"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "serveurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "stations de travail"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "terminaux"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "imprimantes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "imprimantes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "applications"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "nombre d'objets différents trop important!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Stations Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr "le dn n'existe pas:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 msgid "Object group generic"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 msgid "Member"
 msgstr "Membres"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr "Queue téléphonique"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+#, fuzzy
+msgid "Systems"
 msgstr "Système"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Périphériques"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Démarrage"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr "Sommaire FAI"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Applications"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Terminaux"
 
@@ -2256,48 +2289,37 @@ msgstr "Expression régulière pour trouver les objets correspondants"
 msgid "Manage users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "Vous n'avez pas l'autorisation de supprimer cette liste rouge."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "Vous n'avez pas l'autorisation de supprimer cette liste rouge."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:564
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "Delete users"
-msgstr "Supprimer un utilisateur"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "Supprimer un utilisateur"
-
-#: plugins/admin/users/class_userManagement.inc:701
-#, fuzzy
-msgid "User successfully removed."
-msgstr "L'envoi du retour d'information à réussi"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Modèle"
 
@@ -2331,7 +2353,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Classe(s) disponible(s)"
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Administration des utilisateurs"
 
@@ -2373,7 +2395,7 @@ msgid "functional users"
 msgstr "Afficher les utilisateurs fonctionnels"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2403,81 +2425,85 @@ msgstr "Afficher les utilisateurs proxy"
 msgid "Display users matching"
 msgstr "Afficher les utilisateurs correspondants"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Modèles"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "Modifier les propriétés de Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "actif"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "Le changement du mot de passe n'est pas autorisé"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "Supprimer un utilisateur"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 #, fuzzy
 msgid "Number of listed users"
 msgstr "Nombre de pages"
@@ -2497,7 +2523,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Rue"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Administration du groupe"
 
@@ -2574,18 +2600,18 @@ msgstr "Membre du groupe"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "Le fichier de configuration peut être écrit"
@@ -2642,7 +2668,7 @@ msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Groupes"
 
@@ -2674,8 +2700,8 @@ msgstr "SID Samba"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "groupes"
@@ -2732,7 +2758,7 @@ msgstr ""
 msgid "functional groups"
 msgstr "Afficher les groupes fonctionnels"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Nom du groupe"
@@ -2741,23 +2767,23 @@ msgstr "Nom du groupe"
 msgid "Group settings"
 msgstr "Préférences des groupes"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 msgid "GOsa settings 2/3"
 msgstr "Paramètres de GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 msgid "Customize special parameters"
 msgstr "Customiser les paramètres spéciaux"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "Non"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2836,9 +2862,9 @@ msgstr "Recherche"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Appliquer"
@@ -2846,15 +2872,14 @@ msgstr "Appliquer"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -3178,35 +3203,50 @@ msgstr "Activer la gestion des comptes Netatalk"
 msgid "Government mode"
 msgstr "Mode Gouvernemental"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "Inconnu"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "journaux systèmes"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Erreur LDAP :"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "Méthode de messagerie"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 msgid "Vacation templates"
 msgstr "Modèles de messages d'absence "
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr "Utiliser Cyrus en mode UNIX"
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 msgid "Snapshots / Undo"
 msgstr "Copie instantanée / Undo"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 msgid "Enable snapshots"
 msgstr "Activer la copie instantanée"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 msgid "Snapshot base"
 msgstr "Base pour les snapshots"
 
@@ -3351,12 +3391,6 @@ msgstr ""
 "Soyez prudent avec cet outil, il peut y avoir des références pointant vers "
 "ces machines qui ne seront pas migrées."
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-msgid "Select all"
-msgstr "Sélectionner tout"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr "Bouger les machines windows dans le département GOsa suivant"
@@ -3502,23 +3536,23 @@ msgstr ""
 "d'utilisateurs, veuillez les sélectionner et utiliser le bouton 'migration' "
 "ci dessous."
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 msgid "LDAP inspection"
 msgstr "Vérification de l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr "Analyse de votre annuaire LDAP pour la compatibilité avec GOsa"
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 msgid "Checking for root object"
 msgstr "Recherche de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr "Vérification des permissions sur l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Vérification des départements invisibles"
@@ -3539,47 +3573,47 @@ msgstr "Vérification d'utilisateurs en dehors de la branche people"
 msgid "Checking for groups outside the groups tree"
 msgstr "Vérification des groupes en dehors de la branche groups"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr "Vérification de stations windows en dehors de la branche winstation"
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Vérification pour les uid en double"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Vérification pour les uid en double"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 msgid "LDAP query failed"
 msgstr "La requête LDAP à échoué"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr "L'objet racine est probablement manquant."
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3589,19 +3623,19 @@ msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'uidNumber'."
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Echec"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
@@ -3609,141 +3643,141 @@ msgstr ""
 "J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
 "s'."
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 msgid "Migrate"
 msgstr "Migrer"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "J'ai trouvé %s groupes en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 msgid "Move"
 msgstr "Bouger"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 "L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr "J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans GOsa."
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Migrer"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Aller au département de base"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr "J'ai trouvé %s département(s) qui ne seront pas visible dans GOsa."
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr "Il n'y a pas d'administrateur GOsa dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "Le mot de passe expirera le"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr ""
 "Le mot de passe entré dans le champ nouveau et celui dans le champ "
 "vérification ne concordent pas!"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "Erreur PHP"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Le nom d'utilisateur est incorrect !"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, fuzzy, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 "Mettre l'option (FAIstate) pour l'objet '%s' à échoué, la valeur était '%s'."
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Impossible de bouger les utilisateurs vers le département spécifié."
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr "Les stations windows seront bougées depuis"
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 msgid "to"
 msgstr "vers"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr "Mise à jour des références suivantes aussi"
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr "Les groupes seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr "Les utilisateurs seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre "
 "annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 msgid "Try to create root object"
 msgstr "Essai de création de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr "L'objet racine n'a pas pu être crée, vous devrez essayer vous même."
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Bouger '%s' vers '%s'"
@@ -3883,11 +3917,6 @@ msgstr "Configuration Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Erreur LDAP :"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4204,7 +4233,7 @@ msgstr ""
 "que la gestion de leurs quotas. Vous pouvez choisir l'extension dummy pour "
 "que GOsa ne touche a rien."
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "Erreur PHP"
@@ -4213,73 +4242,73 @@ msgstr "Erreur PHP"
 msgid "Completed"
 msgstr "Terminé"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr "Compte / Groupes UNIX"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 msgid "Samba management"
 msgstr "Gestion SAMBA"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 msgid "Mailsystem management"
 msgstr "Gestion de la messagerie"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 msgid "FAX system administration"
 msgstr "Gestion des FAX"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 msgid "Asterisk administration"
 msgstr "Gestion d'asterisk"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 msgid "System inventory"
 msgstr "Gestion de l'inventaire"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 msgid "System-/Configmanagement"
 msgstr "Gestion Système / Configuration"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 msgid "Notification and feedback"
 msgstr "Notification et retour d'information"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 msgid "Get notifications or send feedback"
 msgstr "Recevoir des notifications et des retour d'information"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 #, fuzzy
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 "Erreur lors de l'envoi de votre retour d'information. Le service est "
 "temporairement hors service"
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr "L'envoi du retour d'information à réussi"
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 msgid "Please specify a valid email address."
 msgstr "Veuillez indiquer une adresse de messagerie valide."
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 #, fuzzy
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
@@ -4403,7 +4432,7 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -4412,11 +4441,11 @@ msgstr ""
 "La fonctionnalité pour les copie instantanées est activée, mais la variable "
 "requise '%s' n'est pas configurée dans votre gosa.conf."
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "from"
 msgstr "de"
 
@@ -4443,12 +4472,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Serveur de terminaux"
@@ -4463,12 +4492,12 @@ msgstr "Impossible de lire le fichier csv '%s'."
 msgid "These objects will be pasted: %s"
 msgstr "Que ce qui sera exécuté ici"
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, fuzzy, php-format
 msgid "This object will be pasted: %s"
 msgstr "Que ce qui sera exécuté ici"
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Impossible de coller"
@@ -4746,7 +4775,6 @@ msgstr "Extension d'inventaire"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Enregistrer"
@@ -4991,49 +5019,56 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr ""
+"Ce rôle ne peut pas être supprimé car il est encore utilisé. Les objects  "
+"suivants %s utilisent ce rôle"
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 "Ce rôle ne peut pas être supprimé car il est encore utilisé. Les objects  "
 "suivants %s utilisent ce rôle"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire le fichier '%s'."
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible de lire le fichier '%s'."
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible de lire le fichier '%s'."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Aller au département de base"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible de lire le fichier '%s'."
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support mhash"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5051,43 +5086,49 @@ msgid "Please fix the above error and reload the page."
 msgstr "Veuillez regarder les journaux systèmes de GOsa."
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Racine"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Accueil"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr "Restaurer la copie instantanée des objets déjà effacés"
 
@@ -5103,6 +5144,11 @@ msgstr "Créer un nouveau snapshot depuis cet objet"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5117,28 +5163,28 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -5147,31 +5193,42 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
 "votre fichier LDIF à partir de la ligne %s !"
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
 "l'administrateur du système."
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 #, fuzzy
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "SID et/ou RIDBASE absents dans votre configuration !"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "Le fichier de configuration peut être écrit"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5179,17 +5236,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre !"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Impossible de lire le fichier csv '%s'."
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Entrée inconnue '%s'  !"
@@ -5209,15 +5266,45 @@ msgstr "Le mot de passe expirera le"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "Votre mot de passe à expiré !! Choisissez un nouveau mot de passe"
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "L'effacement à été interrompu par l'extension '%s': %s"
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Références"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "Sélectionnez une base"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Utilisateur"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Action"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Filtrer les entrées avec cette syntaxe"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Sélectionnez une base"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5245,61 +5332,61 @@ msgstr "%s résultats de votre recherche avec le mot %s "
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% de correspondance dans le fichier %s"
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 "La création de cette page à occasionné des erreurs d'après l'interpréteur "
 "PHP !"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr "Envoyer vos commentaires au membres du projet Gosa"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr "Envoyer un rapport de bug"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "Erreur PHP"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "classe"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "fonction"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "statique"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "méthode"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr "Trace"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr "Fichier"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr "Ligne"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Type"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "Arguments"
 
@@ -5307,12 +5394,12 @@ msgstr "Arguments"
 msgid "All objects in this category"
 msgstr "Tout les objets dans cette catégorie"
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -5361,32 +5448,32 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "Impossible de se connecter au serveur de base de données !"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu '%"
 "s'."
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique. Veuillez vérifier votre base "
 "de données LDAP."
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -5395,11 +5482,11 @@ msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique. Veuillez vérifier votre base "
 "de données LDAP."
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5408,12 +5495,12 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez vérifier l'entrée 'config' dans gosa.conf !"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "Serveur LDAP"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -5422,12 +5509,12 @@ msgstr ""
 "Détection de verrou multiple pour un même objet. Ceci ne devrait pas être "
 "possible. Effacement des références multiples."
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "La taille limite de %d entrées est dépassée !"
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5436,75 +5523,75 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point de coller l'entrée %s."
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier csv '%s'."
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 #, fuzzy
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 "Attention - base_hook n'est pas disponible. Utilisation de la base par "
 "défaut."
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Gérer l'annuaire"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossible de récupérer les informations sur les schémas. Vérification des "
 "schémas impossibles !"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -5512,32 +5599,32 @@ msgstr ""
 "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
 "multiples changements simultanés."
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -5546,7 +5633,7 @@ msgstr ""
 "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
 "supportent pas cette option."
 
-#: include/functions.inc:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -5554,57 +5641,57 @@ msgstr ""
 "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
 "l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Allemand"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Français"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "Italien"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Anglais"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr "Polonais"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 msgid "Chinese"
 msgstr "Chinois"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Russe"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -5612,7 +5699,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5620,122 +5707,124 @@ msgstr ""
 msgid "Access control"
 msgstr "Contrôle d'accès"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr "Remise à zéro des ACL"
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Pas d'ACL pour cette catégorie"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contient les ACL pour ces objets: %s"
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "Catégorie"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, fuzzy, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Afficher/Cacher la configuration avancée"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 msgid "Create objects"
 msgstr "Créer un objet"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 msgid "Move objects"
 msgstr "Bouger un objet"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 msgid "Remove objects"
 msgstr "Enlever les objets"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr "Modifiable par le propriétaire"
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 msgid "Move object"
 msgstr "Bouger un objet"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 msgid "Remove object"
 msgstr "Enlever un objet"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "lecture"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "écrire"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 msgid "Complete object"
 msgstr "L'objet au complet"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Entrée inconnue '%s'  !"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrée inconnue '%s'  !"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, php-format
 msgid "Role: %s"
 msgstr "Rôle : %s"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "! identifiant inconnu"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contient les paramètres pour ces objets: %s"
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "Membres"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 #, fuzzy
 msgid "ACL takes effect for all users"
 msgstr "ACL valide pour tout les utilisateurs"
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 msgid "Access control list"
 msgstr "Contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 msgid "ACL roles"
 msgstr "Rôles ACL"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 msgid "Role name"
 msgstr "Nom du rôle"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 msgid "Role description"
 msgstr "Description du rôle"
 
@@ -5812,28 +5901,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Reconnexion"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Paramètres supplémentaire de GOsa"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr "Utiliser les membres depuis"
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr "Membres disponibles"
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr "Liste les destinataires possibles pour les messages"
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr "Lister les destinataires du message"
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "ACL pour cet objet"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 msgid "Available roles"
 msgstr "Type de rôles disponibles"
 
@@ -6115,75 +6209,17 @@ msgstr "Nouveau mot de passe"
 msgid "Change"
 msgstr "Changer"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "Options de messagerie"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-msgid "Hour"
-msgstr "Heure"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Imprimante"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "Mai"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "mois"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "Recherche"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Mot de passe"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "Configuration de PHP"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
@@ -6191,22 +6227,26 @@ msgstr ""
 "FATAL: Register globals est activé. GOsa ne permettra pas aux utilisateurs "
 "de se connecter tant que ceci n'est pas corrigé par un administrateur."
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 "Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe"
 
-#: html/main.php:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "dans"
 
-#: html/main.php:366
+#: html/main.php:371
 #, fuzzy, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s' !"
@@ -6221,81 +6261,81 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Erreur PHP"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation est "
 "inaccessible !"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 #, fuzzy
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 "Votre installation LDAP contient de vieux schémas. Veuillez recommencer "
 "l'installation."
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "Le nom d'utilisateur est incorrect !"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passe !"
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Authentification"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verouillé. Veuillez contacter votre administrateur système."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6336,6 +6376,49 @@ msgstr ""
 msgid "Smarty"
 msgstr "Sommaire"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Restaurer"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Répertoire"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Supprimer un utilisateur"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "L'envoi du retour d'information à réussi"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "Options de messagerie"
+
+#~ msgid "Hour"
+#~ msgstr "Heure"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Imprimante"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "Mai"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "mois"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "Recherche"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Mot de passe"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Paramètre de l'application"
@@ -6471,10 +6554,6 @@ msgstr "Sommaire"
 #~ msgid "sudo role"
 #~ msgstr "! identifiant inconnu"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "Inconnu"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "Avertissement"
@@ -6519,10 +6598,6 @@ msgstr "Sommaire"
 #~ msgid "Flags"
 #~ msgstr "classe"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Le fichier de configuration peut être écrit"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Déploiement de système en masse"
@@ -6754,9 +6829,6 @@ msgstr "Sommaire"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Sélectionner pour afficher les groupes contenant des utilisateurs"
 
-#~ msgid "Applications"
-#~ msgstr "Applications"
-
 #, fuzzy
 #~ msgid "Workstations"
 #~ msgstr "Stations de travail"
@@ -7621,9 +7693,6 @@ msgstr "Sommaire"
 #~ msgid "Schedule"
 #~ msgstr "Compte PHPscheduleit"
 
-#~ msgid "Action"
-#~ msgstr "Action"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Supprimer"
@@ -7733,9 +7802,6 @@ msgstr "Sommaire"
 #~ msgid "Services"
 #~ msgstr "Services"
 
-#~ msgid "FAI summary"
-#~ msgstr "Sommaire FAI"
-
 #~ msgid "OGo"
 #~ msgstr "OGo"
 
@@ -7763,16 +7829,9 @@ msgstr "Sommaire"
 #~ msgid "Packages"
 #~ msgstr "Paquets"
 
-#~ msgid "System logs"
-#~ msgstr "journaux systèmes"
-
 #~ msgid "GOsa logs"
 #~ msgstr "Journaux systèmes GOsa"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Filtrer les entrées avec cette syntaxe"
-
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "
 #~ "your php setup."

diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
index 071640a249983b92839e0a7584f610ba8c0cd362..3614756a39fd7e07c33bc82bb164e78fbdbbbf8b 100644 (file)
--- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -65,7 +65,7 @@ msgstr "Password attuale"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -97,8 +97,8 @@ msgid "Clear fields"
 msgstr "Ripulisci i campi"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -117,9 +117,10 @@ msgstr "Cambia la password"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "Cambia la password"
@@ -130,7 +131,7 @@ msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -166,13 +167,13 @@ msgid "You have no permission to change your password."
 msgstr "Non hai il permesso di cambiare la tua password."
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 #, fuzzy
 msgid "User password"
 msgstr "Nuova password"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Identità"
@@ -193,11 +194,11 @@ msgid "Remove picture"
 msgstr "Elimina foto"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -208,27 +209,27 @@ msgstr "Generale"
 msgid "Edit organizational user settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "femmina"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "maschio"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -239,62 +240,62 @@ msgstr "maschio"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "valido"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "invalido"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Non ci sono certificati installati"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -304,59 +305,63 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+msgid "The selected password method requires initial configuration!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Nome utente"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -369,137 +374,137 @@ msgstr "Nome utente"
 msgid "Name"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Nome"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Telefono"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -507,23 +512,23 @@ msgstr "Strada"
 msgid "Role"
 msgstr "Ruolo"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Utenti"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -533,95 +538,96 @@ msgstr "Utenti"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Base"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titolo di studio"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 #, fuzzy
 msgid "Gender"
 msgstr "Generale"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -629,50 +635,50 @@ msgstr "Qualifica"
 msgid "Location"
 msgstr "Località"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Stato"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificato standard"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
@@ -750,7 +756,7 @@ msgid "Select a base"
 msgstr "Rimuovi"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -768,44 +774,44 @@ msgstr "Telefono privato"
 msgid "Password storage"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Configura"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificati"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Modifica certificati"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Matricola"
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Usa il tab del telefono"
 
@@ -819,7 +825,7 @@ msgstr "Certificato standard"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Rimuovi"
@@ -874,6 +880,7 @@ msgstr "Mostra gruppi di dipartimenti"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -907,21 +914,25 @@ msgid "Search in subtrees"
 msgstr "Seleziona per mostrare le applicazioni"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Seleziona un sistema da aggiungere"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Mostra i sistemi del dipartimento"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Mostra i sistemi che corrispondono a:"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Espressione regolare per selezionare l'indirizzo"
@@ -1000,17 +1011,18 @@ msgstr "Mostra gruppi di posta"
 msgid "Account"
 msgstr "Sicurezza"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "Accesso ai sistemi"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "Unix"
 
@@ -1031,7 +1043,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 #, fuzzy
 msgid "active"
 msgstr "Privato"
@@ -1062,17 +1074,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Ambiente"
@@ -1101,16 +1113,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Avvisa l'utente %s giorni prima che la password spiri"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "disabilitato"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "accesso completo"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "accesso limitato ai seguenti host"
@@ -1120,19 +1135,18 @@ msgstr "accesso limitato ai seguenti host"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Attenzione"
@@ -1253,7 +1267,7 @@ msgstr "Nome dell'oggetto"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1268,66 +1282,65 @@ msgstr "Contenuti"
 msgid "This object has no relationship to other objects."
 msgstr "Questo oggetto non ha relazioni con altri oggetti."
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Posta"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Applicazione"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Stampante"
 
@@ -1369,7 +1382,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr ""
 
@@ -1464,6 +1477,17 @@ msgstr ""
 msgid "List of departments"
 msgstr "Lista dei dipartimenti"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+#, fuzzy
+msgid "Select all"
+msgstr "Rimuovi"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 #, fuzzy
@@ -1477,7 +1501,7 @@ msgstr "Dipartimento"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1490,7 +1514,7 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Imposta dipartimento"
@@ -1498,18 +1522,19 @@ msgstr "Imposta dipartimento"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Creare"
 
@@ -1517,14 +1542,14 @@ msgstr "Creare"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "modifica"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
@@ -1532,14 +1557,14 @@ msgstr "Modifica questo record"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "elimina"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
@@ -1550,8 +1575,8 @@ msgstr "dipartimenti"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Imposta dipartimento"
@@ -1576,7 +1601,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1604,9 +1629,9 @@ msgid "Moving '%s' to '%s'"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Oggetto"
@@ -1650,40 +1675,40 @@ msgstr ""
 msgid "Manage Departments"
 msgstr "Dipartimenti"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1691,14 +1716,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "ACL"
 
@@ -1725,7 +1749,6 @@ msgid "List of acls"
 msgstr "Lista dei gruppi"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr ""
 
@@ -1736,7 +1759,7 @@ msgstr "Mosra gruppi corrispondenti a"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1744,7 +1767,7 @@ msgstr "Azienda"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1754,42 +1777,42 @@ msgstr "Esegui"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
@@ -1826,7 +1849,7 @@ msgstr "Opzioni di accesso"
 msgid "Edit AC roles"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 #, fuzzy
 msgid "All categories"
 msgstr "Aggiungi contatto"
@@ -1836,47 +1859,48 @@ msgstr "Aggiungi contatto"
 msgid "Reset ACL"
 msgstr "Rimuovi"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 #, fuzzy
 msgid "Current object"
 msgstr "Password attuale"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 #, fuzzy
 msgid "Complete subtree"
 msgstr "incompleto"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Modifica"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Rimuovi"
@@ -1906,7 +1930,7 @@ msgstr "classe"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1934,29 +1958,30 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr "Scegli il subtree dove mettere il gruppo"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 #, fuzzy
 msgid "New ACL"
 msgstr "Nuovo"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 #, fuzzy
 msgid "ACL type"
 msgstr "Tipo"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Rimuovi"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Scegli il tuo numero di telefono personale"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
@@ -1965,30 +1990,30 @@ msgstr "Gruppi di oggetti"
 msgid "Manage object groups"
 msgstr "Nome del gruppo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Errore PHP"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
@@ -2022,7 +2047,7 @@ msgstr "Nome del gruppo"
 msgid "Descriptive text for this group"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Oggetti membri"
 
@@ -2033,15 +2058,15 @@ msgid "List of object groups"
 msgstr "Nome del gruppo"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2123,8 +2148,7 @@ msgstr "Mostra gruppi"
 msgid "Number of listed object groups"
 msgstr "Nome del gruppo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2132,126 +2156,134 @@ msgstr "Nome del gruppo"
 msgid "Information"
 msgstr "Informazioni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "dipartimenti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Mostra persone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "gruppi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "applicazioni"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "stampanti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "stampanti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "telefoni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "applicazioni"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "utenti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Amministrazione"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 #, fuzzy
 msgid "Object group generic"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 #, fuzzy
 msgid "Member"
 msgstr "Membri"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 #, fuzzy
 msgid "Phone queue"
 msgstr "Numero di telefono"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
 #, fuzzy
-msgid "System"
+msgid "Systems"
 msgstr "Sistemi"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Avvio"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Applicazioni"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Terminali"
 
@@ -2287,49 +2319,37 @@ msgstr ""
 msgid "Manage users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "utenti"
 
-#: plugins/admin/users/class_userManagement.inc:564
-#, fuzzy
-msgid "Delete users"
-msgstr "Rimuovi"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-#, fuzzy
-msgid "Delete user"
-msgstr "Rimuovi"
-
-#: plugins/admin/users/class_userManagement.inc:701
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "User successfully removed."
-msgstr "Setup completato"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr ""
 
@@ -2359,7 +2379,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Amministrazione utenti"
 
@@ -2397,7 +2417,7 @@ msgid "functional users"
 msgstr "Mostra utenti funzionali"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 #, fuzzy
 msgid "Posix"
@@ -2428,92 +2448,97 @@ msgstr "Mostra utenti proxy"
 msgid "Display users matching"
 msgstr "Mostra utenti che corrispondono a"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Template"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "Privato"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 #, fuzzy
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "Cambia la password"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+#, fuzzy
+msgid "Delete user"
+msgstr "Rimuovi"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 msgid "Number of listed users"
 msgstr ""
 
@@ -2529,7 +2554,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Strada"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Amministrazione dei gruppi di utenti"
 
@@ -2604,18 +2629,18 @@ msgstr "Membri del gruppo"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -2670,7 +2695,7 @@ msgid "Generic group settings"
 msgstr "Impostazioni generali delle code"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Gruppi di utenti"
 
@@ -2708,8 +2733,8 @@ msgstr "Samba"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "gruppi"
@@ -2762,7 +2787,7 @@ msgstr "Seleziona per mostrare i gruppi che hanno solo aspetti funzionali"
 msgid "functional groups"
 msgstr "Mostra gruppi funzionali"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Nome del gruppo"
@@ -2772,26 +2797,26 @@ msgstr "Nome del gruppo"
 msgid "Group settings"
 msgstr "Impostazioni FAX"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "Opzioni di posta dell'identità"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "Parametro"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 #, fuzzy
 msgid "No"
 msgstr "nessuno"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 #, fuzzy
@@ -2877,9 +2902,9 @@ msgstr "Cerca"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Applica"
@@ -2887,15 +2912,14 @@ msgstr "Applica"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Annulla"
@@ -3253,39 +3277,54 @@ msgstr "Crea estensioni telefoniche"
 msgid "Government mode"
 msgstr "nella cartella"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "Utenti di Dominio"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "Log di sitema"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Errore LDAP"
+
+#: setup/setup_config2.tpl:193
 #, fuzzy
 msgid "Mail settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "Metodo di amministrazione della posta"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Messaggio di di risposta automatica"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Nome applicazione"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Crea estensioni di posta"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Nome applicazione"
@@ -3418,13 +3457,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-#, fuzzy
-msgid "Select all"
-msgstr "Rimuovi"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3552,25 +3584,25 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 #, fuzzy
 msgid "LDAP inspection"
 msgstr "Ispezione della configurazione PHP"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 #, fuzzy
 msgid "Checking for root object"
 msgstr "Controllo il supporto per iconv"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Controllo il supporto per iconv"
@@ -3595,48 +3627,48 @@ msgstr "Controllo il modulo cups"
 msgid "Checking for groups outside the groups tree"
 msgstr "Controllo il modulo cups"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Controllo il supporto per %s"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Controllo il supporto per %s"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "La query al database è fallita!"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3646,157 +3678,157 @@ msgstr "Prego inserire un numero di telefono valido!"
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Fallito"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 #, fuzzy
 msgid "Migrate"
 msgstr "Creare"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, fuzzy, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 #, fuzzy
 msgid "Move"
 msgstr "Dominio"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Creare"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Vai al dipartimento base"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "La password spira il"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "Errore PHP"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Mostra utenti del dipartimento"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 #, fuzzy
 msgid "Try to create root object"
 msgstr "Gruppo di oggetti"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
@@ -3939,11 +3971,6 @@ msgstr "Impostazioni Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Errore LDAP"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4268,7 +4295,7 @@ msgstr ""
 "possiedono interfacce per impostare opzioni come ad esempio la quota. Puoi "
 "impostare il metodo 'dummy' per mantenere tutte le impostazioni."
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "Stato"
@@ -4278,80 +4305,80 @@ msgstr "Stato"
 msgid "Completed"
 msgstr "incompleto"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 #, fuzzy
 msgid "UNIX accounts/groups"
 msgstr "Account Unix"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 #, fuzzy
 msgid "Samba management"
 msgstr "Dirigenza"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 #, fuzzy
 msgid "Mailsystem management"
 msgstr "Riferimenti"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 #, fuzzy
 msgid "FAX system administration"
 msgstr "Amministrazione utenti"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 #, fuzzy
 msgid "Asterisk administration"
 msgstr "Amministrazione utenti"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 #, fuzzy
 msgid "System inventory"
 msgstr "Elimina contatto"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 #, fuzzy
 msgid "System-/Configmanagement"
 msgstr "Riferimenti"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Rubrica"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 #, fuzzy
 msgid "Notification and feedback"
 msgstr "Non ci sono certificati installati"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 #, fuzzy
 msgid "Get notifications or send feedback"
 msgstr "Non ci sono certificati installati"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4467,18 +4494,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 #, fuzzy
 msgid "from"
 msgstr "e"
@@ -4506,12 +4533,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -4526,12 +4553,12 @@ msgstr "Rimuovi"
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Crea estensioni telefoniche"
@@ -4806,7 +4833,6 @@ msgstr "Elimina foto"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Salva"
@@ -5046,47 +5072,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr "Nome descrittivo del gruppo"
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Vai al dipartimento base"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Rimuovi"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Controllo il supporto per iconv"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5103,44 +5134,50 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Root"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Sali di dipartimento"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Home"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 #, fuzzy
 msgid "Restore"
 msgstr "Riprova"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -5158,6 +5195,11 @@ msgstr "Gruppo di oggetti"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5172,55 +5214,66 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, fuzzy, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "File di configurazione"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5228,17 +5281,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Rimuovi"
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -5257,15 +5310,45 @@ msgstr "La password spira il"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Riferimenti"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "Rimuovi"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Utenti"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Azione"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Mostra gli indirizzi che corrispondono"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Rimuovi"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5293,59 +5376,59 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "Errore PHP"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "classe"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "funzione"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "statico"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "metodo"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Tipo"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "Argomenti"
 
@@ -5354,12 +5437,12 @@ msgstr "Argomenti"
 msgid "All objects in this category"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr ""
 
@@ -5407,29 +5490,29 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "Impossibile connettersi al server del database!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, fuzzy, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -5437,11 +5520,11 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5449,195 +5532,195 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continua"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Modifica contatto"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Rimuovi"
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Amministrazione LDAP"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lista dei dipartimenti"
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Tedesco"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Francese"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Inglese"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 #, fuzzy
 msgid "Polish"
 msgstr "Inglese"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 #, fuzzy
 msgid "Chinese"
 msgstr "reset"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5646,129 +5729,131 @@ msgstr ""
 msgid "Access control"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "classe"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Opzioni di posta avanzate"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 #, fuzzy
 msgid "Create objects"
 msgstr "Gruppo di oggetti"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 #, fuzzy
 msgid "Move objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 #, fuzzy
 msgid "Remove objects"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 #, fuzzy
 msgid "Move object"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 #, fuzzy
 msgid "Remove object"
 msgstr "Oggetti membri"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "leggere"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "scrivere"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 #, fuzzy
 msgid "Complete object"
 msgstr "Gruppo di oggetti"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Ruolo"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "Membri"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 #, fuzzy
 msgid "Access control list"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACL"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 #, fuzzy
 msgid "Role name"
 msgstr "Cognome"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 #, fuzzy
 msgid "Role description"
 msgstr "Descrizoione unità"
@@ -5842,28 +5927,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Entra"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Opzioni applicazione"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "Controllo il supporto per iconv"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 #, fuzzy
 msgid "Available roles"
 msgstr "Applicazioni disponibili"
@@ -6106,96 +6196,41 @@ msgstr "Nuova password"
 msgid "Change"
 msgstr "Annulla"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "Opzioni di posta"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-#, fuzzy
-msgid "Hour"
-msgstr "ora"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Stampante"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "giorno"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "mese"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "Cerca"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Password"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "Scarica il file di  configurazione"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: html/main.php:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "Ricerca"
 
-#: html/main.php:366
+#: html/main.php:371
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
@@ -6211,77 +6246,77 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Stato"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Destinazione"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6317,6 +6352,50 @@ msgstr ""
 msgid "Smarty"
 msgstr "Avvio"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Riprova"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Directory"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "Setup completato"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "Opzioni di posta"
+
+#, fuzzy
+#~ msgid "Hour"
+#~ msgstr "ora"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Stampante"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "giorno"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "mese"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "Cerca"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Password"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Nome applicazione"
@@ -6471,10 +6550,6 @@ msgstr "Avvio"
 #~ msgid "Flags"
 #~ msgstr "classe"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "File di configurazione"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Dipartimento"
@@ -6659,9 +6734,6 @@ msgstr "Avvio"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Mostra gruppi che contengono utenti"
 
-#~ msgid "Applications"
-#~ msgstr "Applicazioni"
-
 #, fuzzy
 #~ msgid "Phones"
 #~ msgstr "Telefono"
@@ -7287,9 +7359,6 @@ msgstr "Avvio"
 #~ msgid "Schedule"
 #~ msgstr "Estenzioni PHPGroupware"
 
-#~ msgid "Action"
-#~ msgstr "Azione"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Rimuovi"
@@ -7410,17 +7479,10 @@ msgstr "Avvio"
 #~ msgid "Packages"
 #~ msgstr "Pacchetti"
 
-#~ msgid "System logs"
-#~ msgstr "Log di sitema"
-
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "Utenti di Dominio"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Mostra gli indirizzi che corrispondono"
-
 #, fuzzy
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "

diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index d07f2f4e50a166b89baa4ff7f91474f82d5cfce8..d8d38a2c459e35461d784a991451b7c20e09f7cc 100644 (file)
--- a/gosa-core/locale/core/messages.po
+++ b/gosa-core/locale/core/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,7 +56,7 @@ msgstr ""
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -87,8 +87,8 @@ msgid "Clear fields"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -106,9 +106,10 @@ msgstr ""
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 msgid "Password change"
 msgstr ""
 
@@ -118,7 +119,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -152,12 +153,12 @@ msgid "You have no permission to change your password."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 msgid "User password"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr ""
@@ -178,11 +179,11 @@ msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -192,27 +193,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -223,60 +224,60 @@ msgstr ""
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 msgid "Password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -286,58 +287,62 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 msgid "LDAP error"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+msgid "The selected password method requires initial configuration!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -350,136 +355,136 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -487,22 +492,22 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -512,89 +517,90 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -602,44 +608,44 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 msgid "Fax number"
 msgstr ""
 
@@ -711,7 +717,7 @@ msgid "Select a base"
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -729,44 +735,44 @@ msgstr ""
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -780,7 +786,7 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr ""
@@ -830,6 +836,7 @@ msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -862,21 +869,25 @@ msgid "Search in subtrees"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr ""
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr ""
@@ -952,17 +963,18 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr ""
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr ""
 
@@ -981,7 +993,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr ""
 
@@ -1009,17 +1021,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr ""
@@ -1045,16 +1057,19 @@ msgid "Warn user %s days before password expiery"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr ""
@@ -1064,19 +1079,18 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr ""
@@ -1184,7 +1198,7 @@ msgstr ""
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1199,66 +1213,65 @@ msgstr ""
 msgid "This object has no relationship to other objects."
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr ""
 
@@ -1294,7 +1307,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr ""
 
@@ -1388,6 +1401,16 @@ msgstr ""
 msgid "List of departments"
 msgstr ""
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+msgid "Select all"
+msgstr ""
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1400,7 +1423,7 @@ msgstr ""
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1413,7 +1436,7 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr ""
@@ -1421,18 +1444,19 @@ msgstr ""
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr ""
 
@@ -1440,14 +1464,14 @@ msgstr ""
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr ""
 
@@ -1455,14 +1479,14 @@ msgstr ""
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr ""
 
@@ -1472,8 +1496,8 @@ msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 msgid "Number of listed departments"
 msgstr ""
 
@@ -1497,7 +1521,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 msgid "Fatal error"
 msgstr ""
@@ -1524,9 +1548,9 @@ msgid "Moving '%s' to '%s'"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr ""
@@ -1569,39 +1593,39 @@ msgstr ""
 msgid "Manage Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1609,14 +1633,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr ""
 
@@ -1640,7 +1663,6 @@ msgid "List of acls"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr ""
 
@@ -1650,14 +1672,14 @@ msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 msgid "Copy"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 msgid "Cut"
 msgstr ""
@@ -1666,39 +1688,39 @@ msgstr ""
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr ""
 
@@ -1728,7 +1750,7 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 msgid "All categories"
 msgstr ""
 
@@ -1736,44 +1758,45 @@ msgstr ""
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1800,7 +1823,7 @@ msgstr ""
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1826,25 +1849,26 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 msgid "New ACL"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 msgid "ACL type"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 msgid "Select an acl type"
 msgstr ""
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 msgid "List of available ACL categories"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr ""
 
@@ -1852,28 +1876,28 @@ msgstr ""
 msgid "Manage object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 msgid "Infrastructure error"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 msgid "object group"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr ""
 
@@ -1903,7 +1927,7 @@ msgstr ""
 msgid "Descriptive text for this group"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr ""
 
@@ -1913,15 +1937,15 @@ msgid "List of object groups"
 msgstr ""
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -1992,8 +2016,7 @@ msgstr ""
 msgid "Number of listed object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2001,119 +2024,127 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 msgid "people"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 msgid "printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 msgid "Member"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr ""
 
@@ -2146,43 +2177,33 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 msgid "You have no permission to use this template!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 msgid "user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:564
-msgid "Delete users"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
+#: plugins/admin/users/class_userManagement.inc:633
+msgid "You have no permission to change the lock status for this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:701
-msgid "User successfully removed."
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr ""
 
@@ -2211,7 +2232,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr ""
 
@@ -2246,7 +2267,7 @@ msgid "functional users"
 msgstr ""
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr ""
@@ -2272,78 +2293,82 @@ msgstr ""
 msgid "Display users matching"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Apply template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 msgid "inactive"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 msgid "Not allowed"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:459
 msgid "Number of listed users"
 msgstr ""
 
@@ -2358,7 +2383,7 @@ msgstr ""
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr ""
 
@@ -2430,18 +2455,18 @@ msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 msgid "Configuration error"
 msgstr ""
 
@@ -2494,7 +2519,7 @@ msgid "Generic group settings"
 msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr ""
 
@@ -2526,8 +2551,8 @@ msgstr ""
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 msgid "group"
 msgstr ""
 
@@ -2572,7 +2597,7 @@ msgstr ""
 msgid "functional groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 msgid "Number of listed groups"
 msgstr ""
 
@@ -2580,23 +2605,23 @@ msgstr ""
 msgid "Group settings"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 msgid "Customize special parameters"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2669,9 +2694,9 @@ msgstr ""
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr ""
@@ -2679,15 +2704,14 @@ msgstr ""
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr ""
@@ -2997,35 +3021,47 @@ msgstr ""
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+msgid "Logging options"
+msgstr ""
+
+#: setup/setup_config2.tpl:186
+msgid "Syslog"
+msgstr ""
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr ""
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr ""
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 msgid "Snapshot base"
 msgstr ""
 
@@ -3149,12 +3185,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-msgid "Select all"
-msgstr ""
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3273,23 +3303,23 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 msgid "Checking for invisible departments"
 msgstr ""
 
@@ -3309,45 +3339,45 @@ msgstr ""
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3357,147 +3387,147 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
@@ -3631,10 +3661,6 @@ msgstr ""
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr ""
-
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -3891,7 +3917,7 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 msgid "Setup error"
 msgstr ""
 
@@ -3899,70 +3925,70 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 msgid "Samba management"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 msgid "Mailsystem management"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 msgid "FAX system administration"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 msgid "Asterisk administration"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 msgid "System inventory"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 msgid "System-/Configmanagement"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 msgid "Notification and feedback"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 msgid "Get notifications or send feedback"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 msgid "Please specify a valid email address."
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4076,18 +4102,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "from"
 msgstr ""
 
@@ -4114,12 +4140,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 msgid "Internal error"
 msgstr ""
 
@@ -4133,12 +4159,12 @@ msgstr ""
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 msgid "Cannot paste"
 msgstr ""
 
@@ -4396,7 +4422,6 @@ msgstr ""
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr ""
@@ -4619,47 +4644,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, php-format
+msgid "This '%s' is still in use."
+msgstr ""
+
+#: include/utils/class_msgPool.inc:499
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -4676,43 +4706,49 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 msgid "Restore"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -4728,6 +4764,11 @@ msgstr ""
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -4742,53 +4783,63 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+msgid "Configuration"
+msgstr ""
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -4796,16 +4847,16 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -4822,15 +4873,42 @@ msgstr ""
 msgid "The user password was resetted, please set a new password value!"
 msgstr ""
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr ""
 
+#: include/class_baseSelectDialog.inc:44
+msgid "Choose a base"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+msgid "Use"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:72
+msgid "Filter entries with this syntax"
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:136
+#, php-format
+msgid "Select this base"
+msgstr ""
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -4858,59 +4936,59 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr ""
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr ""
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr ""
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr ""
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr ""
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr ""
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr ""
 
@@ -4918,12 +4996,12 @@ msgstr ""
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr ""
 
@@ -4968,226 +5046,226 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr ""
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5195,117 +5273,119 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 msgid "Move object"
 msgstr ""
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 msgid "Remove object"
 msgstr ""
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 msgid "Role name"
 msgstr ""
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 msgid "Role description"
 msgstr ""
 
@@ -5370,27 +5450,31 @@ msgstr ""
 msgid "Sign in again"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+msgid "Additional filter options"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 msgid "ACL for this object"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 msgid "Available roles"
 msgstr ""
 
@@ -5621,86 +5705,38 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-msgid "Heimdal options"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-msgid "Hour"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-msgid "Minute"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-msgid "Day"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-msgid "Month"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-msgid "Year"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-msgid "Password end"
-msgstr ""
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr ""
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:365
+#: html/main.php:370
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:366
+#: html/main.php:371
 #, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
@@ -5715,73 +5751,73 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/index.php:166
+#: html/index.php:167
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:374
+#: html/index.php:375
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"

diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
index b06b5bff7d2627c2b95215a57508ead618c5b70f..243dae3c18e57b75553b6b48ed37f54d18b2df74 100644 (file)
--- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+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"
@@ -68,7 +68,7 @@ msgstr "Huidig wachtwoord"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -100,8 +100,8 @@ msgid "Clear fields"
 msgstr "Wis velden"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -120,9 +120,10 @@ msgstr "Verander wachtwoord"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
@@ -133,7 +134,7 @@ msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -173,13 +174,13 @@ 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:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 #, fuzzy
 msgid "User password"
 msgstr "Wachtwoord wissen"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Mijn account"
@@ -200,11 +201,11 @@ msgid "Remove picture"
 msgstr "Plaatje verwijderen"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -215,27 +216,27 @@ msgstr "Algemeen"
 msgid "Edit organizational user settings"
 msgstr "Programma instellingen"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "vrouw"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "man"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -246,63 +247,63 @@ msgstr "man"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr "Fout"
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: 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:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "geldig"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "ongeldig"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -312,59 +313,64 @@ msgstr "Dit programma is niet meer beschikbaar."
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "Dit programma is niet meer beschikbaar."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Inlognaam"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -377,137 +383,137 @@ msgstr "Inlognaam"
 msgid "Name"
 msgstr "Naam"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Naam"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Telefoon"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -515,23 +521,23 @@ msgstr "Straat"
 msgid "Role"
 msgstr "Funktie"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -541,95 +547,96 @@ msgstr "Gebruikers"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Basis"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Organisatie"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 #, fuzzy
 msgid "Gender"
 msgstr "Afzender"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -637,49 +644,49 @@ msgstr "Functie"
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
@@ -753,7 +760,7 @@ msgid "Select a base"
 msgstr "Selecteer een basis"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -771,44 +778,44 @@ msgstr "Telefoon privé"
 msgid "Password storage"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Instellen"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Bewerk certificaten"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
@@ -822,7 +829,7 @@ msgstr "Standaard certificaat"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Verwijderen"
@@ -875,6 +882,7 @@ msgstr "Toon groepen van afdeling"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -908,21 +916,25 @@ msgid "Search in subtrees"
 msgstr "Zoek binnen subtree"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Selecteer de toe te voegen systemen"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Toon systemen van afdeling"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Toon de overeenkomende systemen"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Reguliere expresie voor overeenkomende adressen"
@@ -1001,17 +1013,18 @@ msgstr "Toon E-mail groepen"
 msgid "Account"
 msgstr "Account"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "Unix"
 
@@ -1031,7 +1044,7 @@ msgstr "gratie tijd actief"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "actief"
 
@@ -1061,17 +1074,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Omgeving"
@@ -1100,16 +1113,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "gedeactiveerd"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "volledige toegang"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
@@ -1119,19 +1135,18 @@ msgstr "sta toegang op deze computers toe"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -1254,7 +1269,7 @@ msgstr "Objectnaam"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1269,66 +1284,65 @@ msgstr "Inhoud"
 msgid "This object has no relationship to other objects."
 msgstr "Dit object heeft geen relatie met andere objecten."
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "E-mail"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "Ftp"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Programma"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Objectgroep"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Printer"
 
@@ -1370,7 +1384,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Afdeling beheer"
 
@@ -1472,6 +1486,17 @@ msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
 msgid "List of departments"
 msgstr "Lijst met afdelingen"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+#, fuzzy
+msgid "Select all"
+msgstr "Selecteer"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1484,7 +1509,7 @@ msgstr "Afdelingnaam"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1497,7 +1522,7 @@ msgstr "Reguliere expressie voor overeenkomende afdelingen"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Verwerk afdeling"
@@ -1505,18 +1530,19 @@ msgstr "Verwerk afdeling"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "Verwerk"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -1524,14 +1550,14 @@ msgstr "Aanmaken"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "Bewerk"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
@@ -1539,14 +1565,14 @@ msgstr "Bewerk deze invoer"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "Verwijder"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
@@ -1556,8 +1582,8 @@ msgstr "afdeling"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Naam van de afdeling"
@@ -1583,7 +1609,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1614,9 +1640,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Object"
@@ -1660,40 +1686,40 @@ msgstr "Verwijderen van markering van object '%s'"
 msgid "Manage Departments"
 msgstr "Afdelingen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1701,14 +1727,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "Rechten"
 
@@ -1739,7 +1764,6 @@ msgid "List of acls"
 msgstr "Lijst met macro's"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "Samenvatting"
 
@@ -1750,7 +1774,7 @@ msgstr "Toon overeenkomende macro's"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1758,7 +1782,7 @@ msgstr "kopieer"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1768,39 +1792,39 @@ msgstr "knippen"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr "Plakken"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "knippen"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "kopieer"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
@@ -1836,7 +1860,7 @@ msgstr "Toegangsopties"
 msgid "Edit AC roles"
 msgstr "Rechten"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 #, fuzzy
 msgid "All categories"
 msgstr "Categorie toevoegen"
@@ -1846,47 +1870,48 @@ msgstr "Categorie toevoegen"
 msgid "Reset ACL"
 msgstr "Verwijderen"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 #, fuzzy
 msgid "One level"
 msgstr "Log prioriteit"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 #, fuzzy
 msgid "Current object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Subonderdelen negeren"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "Omhoog"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "Omlaag"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Bewerken"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1915,7 +1940,7 @@ msgstr "Categorie"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1943,29 +1968,30 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 #, fuzzy
 msgid "New ACL"
 msgstr "Nieuw"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 #, fuzzy
 msgid "ACL type"
 msgstr "type"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Selecteer een basis"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Lijst met beschikbare pakketten"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -1974,31 +2000,31 @@ msgstr "Objectgroepen"
 msgid "Manage object groups"
 msgstr "Naam van objectgroepen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP fout"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Gebruiker"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2032,7 +2058,7 @@ msgstr "Naam van de groep"
 msgid "Descriptive text for this group"
 msgstr "Omschrijving voor deze groep"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
@@ -2042,15 +2068,15 @@ msgid "List of object groups"
 msgstr "Lijst met objectgroepen"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2132,8 +2158,7 @@ msgstr "Toon groepen"
 msgid "Number of listed object groups"
 msgstr "Naam van objectgroepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2141,125 +2166,134 @@ msgstr "Naam van objectgroepen"
 msgid "Information"
 msgstr "Informatie"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "afdelingen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Toon personen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "programma's"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "servers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "programma's"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr "Niet bestaande dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 #, 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:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 #, fuzzy
 msgid "Object group generic"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 #, fuzzy
 msgid "Member"
 msgstr "Groepsleden"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr "Telefoonwachtrij"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+#, fuzzy
+msgid "Systems"
 msgstr "Systeem"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Apparaten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Opstarten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr "FAI samenvatting"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Programma's"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Terminals"
 
@@ -2294,48 +2328,37 @@ msgstr "Reguliere expressie voor overeenkomende objectnamen"
 msgid "Manage users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, 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:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:564
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "Delete users"
-msgstr "Verwijder gebruiker"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "Verwijder gebruiker"
-
-#: plugins/admin/users/class_userManagement.inc:701
-#, fuzzy
-msgid "User successfully removed."
-msgstr "Import was succesvol"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Sjabloon"
 
@@ -2369,7 +2392,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Bestand is beschikbaar"
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Gebruikersbeheer"
 
@@ -2410,7 +2433,7 @@ msgid "functional users"
 msgstr "Toon functionele gebruikers"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2440,81 +2463,85 @@ msgstr "Toon Proxy gebruikers"
 msgid "Display users matching"
 msgstr "Toon overeenkomende gebruikers"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Sjablonen"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "Bewerk Fax eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "Bewerk Netatalk eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "Maak gebruiker aan vanuit sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "Maak gebruiker aan met dit sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "actief"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "wachtwoord"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "Verwijder gebruiker"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 #, fuzzy
 msgid "Number of listed users"
 msgstr "Naam van de afdeling"
@@ -2534,7 +2561,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Straat"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Groepen beheer"
 
@@ -2610,18 +2637,18 @@ msgstr "Groepsleden"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -2679,7 +2706,7 @@ msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Groepen"
 
@@ -2717,8 +2744,8 @@ msgstr "Samba"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "groepen"
@@ -2773,7 +2800,7 @@ msgstr ""
 msgid "functional groups"
 msgstr "Toon functionele groepen"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Naam van de groep"
@@ -2782,25 +2809,25 @@ msgstr "Naam van de groep"
 msgid "Group settings"
 msgstr "Groep instellingen"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "Gebruikersinstellingen"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "Controleer parameter"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "Nee"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2886,9 +2913,9 @@ msgstr "Zoeken"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Toepassen"
@@ -2896,15 +2923,14 @@ msgstr "Toepassen"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Annuleren"
@@ -3269,38 +3295,53 @@ msgstr "Netatalk account beheren"
 msgid "Government mode"
 msgstr "naar map"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "Onbekend"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "Systeem logs"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "LDAP fout:"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "E-mail instellingen"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "E-mail methode"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Werkstation sjabloon"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Het opslaan van de telefoon is mislukt"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Nagios account aanmaken"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Het opslaan van de telefoon is mislukt"
@@ -3435,13 +3476,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-#, fuzzy
-msgid "Select all"
-msgstr "Selecteer"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3570,25 +3604,25 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 #, fuzzy
 msgid "LDAP inspection"
 msgstr "PHP configuratie inspectie"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 #, fuzzy
 msgid "Checking for root object"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Zoeken naar iconv ondersteuning"
@@ -3613,48 +3647,48 @@ msgstr "Zoeken naar CUPS module"
 msgid "Checking for groups outside the groups tree"
 msgstr "Zoeken naar CUPS module"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Zoeken naar functie %s"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Zoeken naar functie %s"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "De database zoekopdracht is mislukt"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3664,159 +3698,159 @@ msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Mislukt"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 #, fuzzy
 msgid "Migrate"
 msgstr "Aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, fuzzy, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "U staat op het punt de invoer '%s' te kopieren."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 #, fuzzy
 msgid "Move"
 msgstr "Modus"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Ga naar basis afdelingen"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "Wachtwoord verloopt op"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, 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:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "PHP fout"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Ga naar de afdeling van de gebruiker"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 #, fuzzy
 msgid "Try to create root object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Verplaatsen van %s naar %s"
@@ -3964,11 +3998,6 @@ msgstr "Samba Instellingen"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "LDAP fout:"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4305,7 +4334,7 @@ msgstr ""
 "voor quota's. U kunt de dummy module kiezen om alle E-mail instellingen "
 "ongewijzigd te laten."
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "Systeem status"
@@ -4315,80 +4344,80 @@ msgstr "Systeem status"
 msgid "Completed"
 msgstr "onvolledig"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 #, fuzzy
 msgid "UNIX accounts/groups"
 msgstr "Account code"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 #, fuzzy
 msgid "Samba management"
 msgstr "Systeembeheer"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 #, fuzzy
 msgid "Mailsystem management"
 msgstr "Systeembeheer"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 #, fuzzy
 msgid "FAX system administration"
 msgstr "Gebruikersbeheer"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 #, fuzzy
 msgid "Asterisk administration"
 msgstr "Gebruikersbeheer"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 #, fuzzy
 msgid "System inventory"
 msgstr "Inventaris verwijderen"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 #, fuzzy
 msgid "System-/Configmanagement"
 msgstr "Systeembeheer"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Adresboek"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 #, fuzzy
 msgid "Notification and feedback"
 msgstr "Geen certificaat geinstalleerd"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 #, fuzzy
 msgid "Get notifications or send feedback"
 msgstr "Secties voor deze versie"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "Geef a.u.b. een geldige scriptnaam op."
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4504,18 +4533,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
@@ -4543,12 +4572,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
@@ -4563,12 +4592,12 @@ msgstr "Kan bestand '%s' niet aanmaken."
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Plakken onmogelijk"
@@ -4849,7 +4878,6 @@ msgstr "Verwijder printer mogelijkheden"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Opslaan"
@@ -5093,47 +5121,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr "Deze 'dn' is geen groep."
+
+#: include/utils/class_msgPool.inc:499
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5150,44 +5183,50 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Basis"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Home"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 #, fuzzy
 msgid "Restore"
 msgstr "Opnieuw proberen"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -5205,6 +5244,11 @@ msgstr "Nieuw FAI object aanmaken"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5219,28 +5263,28 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, 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:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -5249,31 +5293,42 @@ 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:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
 "vanaf regel %s!"
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, 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:228
+#: include/class_config.inc:242
 #, 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:561
+#: include/class_config.inc:574
 #, fuzzy
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuratie bestand"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5281,18 +5336,18 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Onbekende FAI status %s"
@@ -5312,15 +5367,45 @@ msgstr "Wachtwoord verloopt op"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "Uw wachtwoord is verlopen! Kies a.u.b. een nieuw wachtwoord. "
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Referenties"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "Selecteer een basis"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Gebruiker"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Actie"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Filter regels met deze syntax"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Selecteer een basis"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5348,61 +5433,61 @@ msgstr "%s resultaten voor uw zoekopdracht met sleutelwoord %s"
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% resultaat in bestand %s"
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 #, fuzzy
 msgid "Send bugreport"
 msgstr "Afzender"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "PHP fout"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "klasse"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "functie"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "statisch"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "methode"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr "Trace"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr "Bestand"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr "Regel"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Type"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "Argumenten"
 
@@ -5410,12 +5495,12 @@ msgstr "Argumenten"
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -5464,40 +5549,40 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "Kan niet verbinden met de database server!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, 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:379
+#: include/functions.inc:380
 #, 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:449
+#: include/functions.inc:450
 #, 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:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5506,12 +5591,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:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -5520,12 +5605,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:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5534,166 +5619,166 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, 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:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP beheer"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, 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:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Duits"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Frans"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "Italiaans"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Spaans"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Engels"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr "Pools"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -5701,7 +5786,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5710,129 +5795,131 @@ msgstr ""
 msgid "Access control"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "Categorie"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Geavanceerde telefoon instellingen"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 #, fuzzy
 msgid "Create objects"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 #, fuzzy
 msgid "Move objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 #, fuzzy
 msgid "Remove objects"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 #, fuzzy
 msgid "Move object"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 #, fuzzy
 msgid "Remove object"
 msgstr "Lidmaatschap objecten"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "alleen lezen"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 #, fuzzy
 msgid "Complete object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Funktie"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "! onbekend id"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 #, fuzzy
 msgid "Access control list"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 #, fuzzy
 msgid "ACL roles"
 msgstr "Rechten"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 #, fuzzy
 msgid "Role name"
 msgstr "Hernoemen"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 #, fuzzy
 msgid "Role description"
 msgstr "Eenheid omschrijving"
@@ -5912,28 +5999,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Opnieuw inloggen"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Programma instellingen"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "Zoeken naar iconv ondersteuning"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 #, fuzzy
 msgid "Available roles"
 msgstr "Beschikbare programma's"
@@ -6200,76 +6292,17 @@ msgstr "Nieuw wachtwoord"
 msgid "Change"
 msgstr "Kanaal"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "E-mail opties"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-#, fuzzy
-msgid "Hour"
-msgstr "uur"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Printer"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "dag"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "maand"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "Zoeken"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Wachtwoord"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "FAX database"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
@@ -6277,21 +6310,25 @@ msgstr ""
 "FATAAL: 'Register globals' is geactiveerd in PHP. GOsa zal niemand laten "
 "inloggen totdat dit opgelost is door een systeembeheerder."
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, 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:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "in"
 
-#: html/main.php:366
+#: html/main.php:371
 #, fuzzy, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
@@ -6307,81 +6344,81 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Systeem status"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 #, fuzzy
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 "Uw LDAP installatie bevat oude schema definities. Draai het installatie "
 "programma a.u.b. opnieuw."
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Nagios authenticatie"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Account is geblokkeerd. Neem a.u.b. contact op met de systeembeheerder."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "De sessie zal niet versleuteld zijn."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6421,6 +6458,50 @@ msgstr ""
 msgid "Smarty"
 msgstr "Samenvatting"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Opnieuw proberen"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Directory"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Verwijder gebruiker"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "Import was succesvol"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "E-mail opties"
+
+#, fuzzy
+#~ msgid "Hour"
+#~ msgstr "uur"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Printer"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "dag"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "maand"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "Zoeken"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Wachtwoord"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Programmanaam"
@@ -6556,10 +6637,6 @@ msgstr "Samenvatting"
 #~ msgid "sudo role"
 #~ msgstr "! onbekend id"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "Onbekend"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "Waarschuwing"
@@ -6604,10 +6681,6 @@ msgstr "Samenvatting"
 #~ msgid "Flags"
 #~ msgstr "klasse"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Configuratie bestand"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Systeembeheer"
@@ -6805,9 +6878,6 @@ msgstr "Samenvatting"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Selecteer om groepen die gebruikers bevatten te tonen"
 
-#~ msgid "Applications"
-#~ msgstr "Programma's"
-
 #, fuzzy
 #~ msgid "Workstations"
 #~ msgstr "Werkstation"
@@ -7238,9 +7308,6 @@ msgstr "Samenvatting"
 #~ msgid "Groupname / Department"
 #~ msgstr "Groepsnaam / Afdeling"
 
-#~ msgid "This 'dn' is no group."
-#~ msgstr "Deze 'dn' is geen groep."
-
 #, fuzzy
 #~ msgid "Deactivated"
 #~ msgstr "Geactiveerd"
@@ -7660,9 +7727,6 @@ msgstr "Samenvatting"
 #~ msgid "Schedule"
 #~ msgstr "PHPScheduleIt"
 
-#~ msgid "Action"
-#~ msgstr "Actie"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Verwijderen"
@@ -7781,9 +7845,6 @@ msgstr "Samenvatting"
 #~ msgid "Services"
 #~ msgstr "Services"
 
-#~ msgid "FAI summary"
-#~ msgstr "FAI samenvatting"
-
 #~ msgid "OGo"
 #~ msgstr "OGo"
 
@@ -7811,17 +7872,10 @@ msgstr "Samenvatting"
 #~ msgid "Packages"
 #~ msgstr "Pakketten"
 
-#~ msgid "System logs"
-#~ msgstr "Systeem logs"
-
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "Log DB gebruiker"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Filter regels met deze syntax"
-
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "
 #~ "your php setup."

diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
index b6090385ffe00ca5645de64e639646be901cfcd8..2c46f559146c4c2ebc0aa3cbeeb754e3959fc379 100644 (file)
--- a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -63,7 +63,7 @@ msgstr "Obecne hasło"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -95,8 +95,8 @@ msgid "Clear fields"
 msgstr "Wyczyść pola"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -115,9 +115,10 @@ msgstr "Zmień hasło"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "Brak uprawnień do zmiay hasła"
@@ -128,7 +129,7 @@ msgstr "Proszę podać obecne hasło aby kontynuować."
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -163,12 +164,12 @@ msgid "You have no permission to change your password."
 msgstr "Brak uprawnień do zmiany własnego hasła"
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 msgid "User password"
 msgstr "Hasło użytkownika"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Moje konto "
@@ -189,11 +190,11 @@ msgid "Remove picture"
 msgstr "Usuń obrazek"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -204,27 +205,27 @@ msgstr "Ogólne"
 msgid "Edit organizational user settings"
 msgstr "Ustawienia Aplikacji"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "kobieta"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "mężczyzna"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -235,63 +236,63 @@ msgstr "mężczyzna"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr "Błąd"
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certyfikat jest ważny od %s do %s i jest obecnie %s."
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "prawidłowy"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "nieprawidłowy"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "Brak zainstalowanych certyfikatów"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -301,59 +302,64 @@ msgstr "Ta aplikacja nie jest już dostępna."
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "Ta aplikacja nie jest już dostępna."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Login"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -366,137 +372,137 @@ msgstr "Login"
 msgid "Name"
 msgstr "Imię"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Imię"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Fax"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Nmer seryjny certyfikatu"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -504,22 +510,22 @@ msgstr "Ulica"
 msgid "Role"
 msgstr "Pełniona funkcja"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -529,89 +535,90 @@ msgstr "Użytkownicy"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Kontener"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Organizacja"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 msgid "Gender"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -619,44 +626,44 @@ msgstr "Typ pracownika"
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Stan"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 msgid "Pager number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 msgid "Fax number"
 msgstr "Numer fax"
 
@@ -729,7 +736,7 @@ msgid "Select a base"
 msgstr "Wybierz bazę"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -747,44 +754,44 @@ msgstr "Telefon prywatny"
 msgid "Password storage"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Edytuj certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Proszę użyć zakładki telefony"
 
@@ -798,7 +805,7 @@ msgstr "Standardowy certyfikat"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Usuń"
@@ -850,6 +857,7 @@ msgstr "Wyświetl grupy departamentu"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -883,21 +891,25 @@ msgid "Search in subtrees"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Wybierz systemy do dodania"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Wyświetl systemy departamentu"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Wyświetl systemy pasujące"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Wyrażenie regularne dla dopasowania adresów"
@@ -976,17 +988,18 @@ msgstr "Pokaż grupy pocztowe"
 msgid "Account"
 msgstr "Konto"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "UNIX"
 
@@ -1006,7 +1019,7 @@ msgstr "Czas prolongaty aktywny"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "Aktywne"
 
@@ -1036,17 +1049,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Środowisko"
@@ -1072,16 +1085,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "wyłączone"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "pełen dostęp"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
@@ -1091,19 +1107,18 @@ msgstr "zezwól na dostęp do tych hostów"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -1216,7 +1231,7 @@ msgstr "Nazwa obiektu"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1231,66 +1246,65 @@ msgstr "Zawartość"
 msgid "This object has no relationship to other objects."
 msgstr "Ten obiekt nie posiada powiązań z innymi obiektami."
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Poczta"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Aplikacja"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Serwer"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "Cienki klient"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Grupa obiektu"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Drukarka"
 
@@ -1331,7 +1345,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Zarządzanie departamentem"
 
@@ -1431,6 +1445,17 @@ msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
 msgid "List of departments"
 msgstr "Lista departamentów"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+#, fuzzy
+msgid "Select all"
+msgstr "Wybierz"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1443,7 +1468,7 @@ msgstr "Nazwa departamentu"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1456,7 +1481,7 @@ msgstr "Wyrażenie regularne dla dopasowania nazw departamentów"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "Zatwierdź departament"
@@ -1464,18 +1489,19 @@ msgstr "Zatwierdź departament"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "Wyślij"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Utwórz"
 
@@ -1483,14 +1509,14 @@ msgstr "Utwórz"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "edytuj"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
@@ -1498,14 +1524,14 @@ msgstr "Edytuj ten obiekt"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "Usuń"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "Usuń ten obiekt"
 
@@ -1515,8 +1541,8 @@ msgstr "departament"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Nazwa departamentu"
@@ -1542,7 +1568,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1573,9 +1599,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "Przenoszenie '%s' do '%s'"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Obiekt"
@@ -1619,40 +1645,40 @@ msgstr "Usuwanie znacznika z obiektu '%s'"
 msgid "Manage Departments"
 msgstr "Departamenty"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Zamierzasz usunąć całe poddrzewo LDAP umieszczone pod '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1660,14 +1686,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "ACL"
 
@@ -1695,7 +1720,6 @@ msgid "List of acls"
 msgstr "Lista ACLi"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "Podsumowanie"
 
@@ -1705,7 +1729,7 @@ msgstr "Wyświetl ACL pasujące"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1713,7 +1737,7 @@ msgstr "kopiuj"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1723,39 +1747,39 @@ msgstr "wytnij"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr "Wklej"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "wytnij"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "kopiuj"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
@@ -1791,7 +1815,7 @@ msgstr "Kontrola dostępu"
 msgid "Edit AC roles"
 msgstr "ACLe"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
@@ -1800,44 +1824,45 @@ msgstr "Wszystkie kategorie"
 msgid "Reset ACL"
 msgstr "Resetuj ACL'e"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 msgid "One level"
 msgstr "Jeden poziom"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 msgid "Current object"
 msgstr "Obecny obiekt"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 msgid "Complete subtree"
 msgstr "Pełne poddrzewo"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr "Pełne poddrzewo (trwałe)"
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "Góra"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "W dół"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Edytuj"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
@@ -1866,7 +1891,7 @@ msgstr "Kategoria"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr "Wszystkie obiekty w obecnym poddrzewie"
 
@@ -1895,25 +1920,26 @@ msgstr "Przypisane ACL'e dla obecnego wpisu"
 msgid "Choose subtree to place group in"
 msgstr "Wybierz poddrzewo do umieszczenia grupy"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 msgid "New ACL"
 msgstr "Nowy ACL"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 msgid "ACL type"
 msgstr "typ ACL"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 msgid "Select an acl type"
 msgstr "Wybierz typ ACL"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 msgid "List of available ACL categories"
 msgstr "Lista dostępnych kategorii ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Grupy obiektów"
 
@@ -1922,31 +1948,31 @@ msgstr "Grupy obiektów"
 msgid "Manage object groups"
 msgstr "Nazwa grupy obiektów"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "błąd PHP:"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Grupa obiektu"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Użytkownik"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Stacja robocza Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -1978,7 +2004,7 @@ msgstr "Nazwa grupy"
 msgid "Descriptive text for this group"
 msgstr "Tekst opisowy dla tej grupy"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Dodaj członka"
 
@@ -1988,15 +2014,15 @@ msgid "List of object groups"
 msgstr "Lista grupy obiektów"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2078,8 +2104,7 @@ msgstr "Pokaż grupy"
 msgid "Number of listed object groups"
 msgstr "Nazwa grupy obiektów"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2087,123 +2112,132 @@ msgstr "Nazwa grupy obiektów"
 msgid "Information"
 msgstr "Informacja"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "departamenty"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Pokaż ludzi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "grupy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "aplikacje"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "serwery"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "stacje robocze"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "terminale"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "drukarki"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "drukarki"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "telefony"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "aplikacje"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "żaden"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "za dużo różnych obiektów!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "użytkownicy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Stacja Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr "Nieistniejące dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Można połączyć maksymalnie tylko 2 różne typy obiektów!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 msgid "Object group generic"
 msgstr "Podstawowa grupa obiektu"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 msgid "Member"
 msgstr "Członek"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr "Kolejka telefoniczna"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+#, fuzzy
+msgid "Systems"
 msgstr "System"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr "Podsumowanie FAI"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Aplikacje"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Terminale"
 
@@ -2238,48 +2272,37 @@ msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
 msgid "Manage users"
 msgstr "Użytkownicy domeny"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Brak uprawnień do zmiany własnego hasła"
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "Brak uprawnień do usunięcia grupy obiektowej."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "użytkownicy"
 
-#: plugins/admin/users/class_userManagement.inc:564
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "Delete users"
-msgstr "Usuń użytkownika"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "Usuń użytkownika"
-
-#: plugins/admin/users/class_userManagement.inc:701
-#, fuzzy
-msgid "User successfully removed."
-msgstr "Import powiódł się"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "Brak uprawnień do zmiany własnego hasła"
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Szablon"
 
@@ -2313,7 +2336,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Plik jest dostępny"
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Administracja użytkownikami"
 
@@ -2354,7 +2377,7 @@ msgid "functional users"
 msgstr "Pokaż użytkowników funkcjonalnych"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2384,81 +2407,85 @@ msgstr "Pokaż użytkowników proxy"
 msgid "Display users matching"
 msgstr "Wyświetl użytkowników pasujących"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Szablony"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "Edytuj ogólne właściwości"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "Edytuj właściwości UNIX"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "Edytuj właściwości Środowiska"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "Edytuj właściwości Poczty"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "Edytuj właściwości Telefonu"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "Edytuj właściwości Fax"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "Edytuj właściwości Samba"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "Edytuj właściwości Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "Utwórz użytkownika z szablonu"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "Utwórz użytkownika z tego szablonu"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "Aktywne"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "hasło"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "Usuń użytkownika"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 #, fuzzy
 msgid "Number of listed users"
 msgstr "Nazwa departamentu"
@@ -2478,7 +2505,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Ulica"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Administracja Grupą"
 
@@ -2552,18 +2579,18 @@ msgstr "Członkowie grupy"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
@@ -2619,7 +2646,7 @@ msgid "Generic group settings"
 msgstr "Ogólne ustawienia grupy"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Grupy"
 
@@ -2652,8 +2679,8 @@ msgstr "Samba SID"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "grupy"
@@ -2706,7 +2733,7 @@ msgstr "Zaznacz aby zobaczyć grupy, które posiadają tylko aspekty funkcjonaln
 msgid "functional groups"
 msgstr "Pokaż grupy funkcjonalne"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Nazwa grupy"
@@ -2715,25 +2742,25 @@ msgstr "Nazwa grupy"
 msgid "Group settings"
 msgstr "Ustawienia grupy"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "Ustawienia użytkownika"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "Sprawdź parametr"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "Nie"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2818,9 +2845,9 @@ msgstr "Szukaj"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Zastosuj"
@@ -2828,15 +2855,14 @@ msgstr "Zastosuj"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Anuluj"
@@ -3200,38 +3226,53 @@ msgstr "Zarządzaj kontem Netatalk"
 msgid "Government mode"
 msgstr "do folferu"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "Nieznane"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "Logi systemowe"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "błąd LDAP:"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "Typ pocztowy"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Szablon stacji roboczej"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Tworzenie snapshot'u nieudane"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Utwórz spanshot"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Tworzenie snapshot'u nieudane"
@@ -3366,13 +3407,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-#, fuzzy
-msgid "Select all"
-msgstr "Wybierz"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3501,25 +3535,25 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 #, fuzzy
 msgid "LDAP inspection"
 msgstr "Inspekcja instalacji PHP"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 #, fuzzy
 msgid "Checking for root object"
 msgstr "Sprawdzam wsparcie dla iconv"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Sprawdzam wsparcie dla iconv"
@@ -3544,48 +3578,48 @@ msgstr "Sprawdzam moduł cups"
 msgid "Checking for groups outside the groups tree"
 msgstr "Sprawdzam moduł cups"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Sprawdzam funkcję %s"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Sprawdzam funkcję %s"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "Zapytanie do bazy danych nieudane"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Znaleziono powtórzoną wartość dla typu rekordu '%s'."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3595,159 +3629,159 @@ msgstr "Znaleziono powtórzoną wartość dla typu rekordu '%s'."
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Znaleziono powtórzoną wartość dla typu rekordu '%s'."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Niepowodzenie"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 #, fuzzy
 msgid "Migrate"
 msgstr "Utwórz"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, fuzzy, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Zamierzasz skopiować wpis '%s'."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 #, fuzzy
 msgid "Move"
 msgstr "Tryb"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Utwórz"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Utwórz nowy departament"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "Hasło wygasa"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "błąd PHP:"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Przejdź do domowego departamentu użytkowników"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 #, fuzzy
 msgid "to"
 msgstr "Zatrzymaj"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 #, fuzzy
 msgid "Group will be moved from"
 msgstr "Będzie możliwość odtworzenia z"
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 #, fuzzy
 msgid "User will be moved from"
 msgstr "Użyj członków z"
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 #, fuzzy
 msgid "Try to create root object"
 msgstr "Utwórz obiekty"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Przenoszenie '%s' do '%s'"
@@ -3894,11 +3928,6 @@ msgstr "Ustawienia Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "błąd LDAP:"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4228,7 +4257,7 @@ msgstr ""
 "zapewniają interfejsy dla kont użytkowników oraz quota. Można wybrać "
 "sztuczny dodatek, aby pozostawić ustawienia poczty nietknięte."
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "Ustaw status"
@@ -4238,80 +4267,80 @@ msgstr "Ustaw status"
 msgid "Completed"
 msgstr "niepełne"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 #, fuzzy
 msgid "UNIX accounts/groups"
 msgstr "Konta Unix"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 #, fuzzy
 msgid "Samba management"
 msgstr "Zarządzanie systemem"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 #, fuzzy
 msgid "Mailsystem management"
 msgstr "Zarządzanie systemem"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 #, fuzzy
 msgid "FAX system administration"
 msgstr "Administracja użytkownikami"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 #, fuzzy
 msgid "Asterisk administration"
 msgstr "Administracja użytkownikami"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 #, fuzzy
 msgid "System inventory"
 msgstr "Usuń inwentarz"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 #, fuzzy
 msgid "System-/Configmanagement"
 msgstr "Zarządzanie systemem"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Książka adresowa"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 #, fuzzy
 msgid "Notification and feedback"
 msgstr "Powiadomienie wysłane!"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 #, fuzzy
 msgid "Get notifications or send feedback"
 msgstr "Ograniczenia dla nadawcy"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "Proszę podać prawidłową nazwę skryptu."
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4426,7 +4455,7 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -4435,11 +4464,11 @@ msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
 "skonfigurowana w gosa.conf."
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 #, fuzzy
 msgid "from"
 msgstr "losowy"
@@ -4467,12 +4496,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -4487,12 +4516,12 @@ msgstr "Nie można stworzyć pliku '%s'."
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
@@ -4769,7 +4798,6 @@ msgstr "Rozszerzenie inwentarza"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Zapisz"
@@ -5010,47 +5038,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr "Zawiera ustawienia dla tych obiektów: %s"
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Utwórz nowy departament"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Sprawdzam wsparcie dla iconv"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5067,43 +5100,49 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "Główny"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "Przejdź do departamentu użytkowników"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr "Katalog domowy"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 msgid "Restore"
 msgstr "Odtwórz"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr "Otwórz snapshoty usuniętych obiektów"
 
@@ -5119,6 +5158,11 @@ msgstr "Utwórz nowy snapshot z tego obiektu"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5133,28 +5177,28 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -5163,28 +5207,39 @@ msgstr ""
 "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
 "'dn: ...' w linii %s"
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Błąd XML w pliku gosa.conf: %s w linii %d"
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Nie można połączyć się z LDAP. Proszę skontaktować się z administratorem."
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 #, fuzzy
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "Plik konfiguracyjny"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5192,17 +5247,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Nieznany wpis  '%s'!"
@@ -5222,15 +5277,45 @@ msgstr "Hasło wygasa"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "Twoje hasło wygasło !! Proszę wybrać inne hasło"
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Zależności"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "Wybierz bazę"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Użytkownik"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Akcja"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Filtruj elementy z tą składnią"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Wybierz bazę"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5258,60 +5343,60 @@ msgstr "%s wyników zapytania ze słowem %s"
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% trafień w pliku %s"
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "Tworzenie tej strony spowodowało, że interpreter PHP zwrócił błędy!"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 #, fuzzy
 msgid "Send bugreport"
 msgstr "Nadawca"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr "Przełącz informacje"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "błąd PHP:"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "klasa"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "funkcja"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "statyczna"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "metoda"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr "Śledzenie"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr "Plik"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr "Linia"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Typ"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "Argumenty"
 
@@ -5319,12 +5404,12 @@ msgstr "Argumenty"
 msgid "All objects in this category"
 msgstr "Wszystkie obiekty w tej kategorii"
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -5371,39 +5456,39 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "Nie można połączyć się z serwerem baz danych!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5412,12 +5497,12 @@ msgstr ""
 "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
 "'config' w gosa.conf!"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "Serwer LDAP"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -5426,12 +5511,12 @@ msgstr ""
 "Znaleziono wiele blokad dla obiektu do zablokowania. Taka sytuacja nie "
 "powinna się wydażyć - czyszczę wiele odwołań."
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5440,172 +5525,172 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
 "przekroczony"
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Zamierzasz skopiować wpis '%s'."
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr "Wpisów na stronie"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Menedżer LDAP"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Nie można pobrać informacji o schematach z serwera. Sprawdzenie schematów "
 "niemożliwe!"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Wyświetl szablony FAI"
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Plik jest dostępny"
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Niemiecki"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Francuski"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "Włoski"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Angielski"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr "Polski"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5613,126 +5698,128 @@ msgstr ""
 msgid "Access control"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr "Resetuj ACL'e"
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr "Użyj ACL zdefiniowanego w tej roli"
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Brak ustawień ACL w tej kategorii"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Zawiera ACL'e w tych kategoriach: %s"
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "Kategoria"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, fuzzy, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Zaawansowane ustawienia telefonu"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 msgid "Create objects"
 msgstr "Utwórz obiekty"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 msgid "Move objects"
 msgstr "Przenieś obiekty"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 msgid "Remove objects"
 msgstr "Usuń obiekty"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr "Modyfikowalne przez właściciela"
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 msgid "Move object"
 msgstr "Przenieś obiekt"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 msgid "Remove object"
 msgstr "Usuń obiekt"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "czytanie"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "zapisywanie"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 #, fuzzy
 msgid "Complete object"
 msgstr "Utwórz obiekty"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Pełniona funkcja"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "! nieznane id"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "Członkowie"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 #, fuzzy
 msgid "ACL takes effect for all users"
 msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 #, fuzzy
 msgid "Access control list"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACLe"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 #, fuzzy
 msgid "Role name"
 msgstr "Zmień nazwę"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 #, fuzzy
 msgid "Role description"
 msgstr "Opis jednostki"
@@ -5811,28 +5898,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Zaloguj się ponownie"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Ustawienia Aplikacji"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr "Użyj członków z"
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr "Dostępni członkowie"
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr "Wyświetl możliwe cele wiadomości"
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr "Wyświetl odbiorców wiadomości"
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "ACLe dla tego obiektu"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 #, fuzzy
 msgid "Available roles"
 msgstr "Dostępni członkowie"
@@ -6094,76 +6186,17 @@ msgstr "Nowe hasło"
 msgid "Change"
 msgstr "Kanał"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "Opcje poczty"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-#, fuzzy
-msgid "Hour"
-msgstr "godzina"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Drukarka"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "dzień"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "miesiąc"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "Szukaj"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Hasło"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "Konfiguracja bazy FAX"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
@@ -6171,21 +6204,25 @@ msgstr ""
 "BŁĄD: Register globals jest włączone. GOsa odmówi logowania do momentu "
 "poprawienia tego parametru przez administratora."
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr "Twoje hasło zaraz wygaśnie, proszę zmienić hasło"
 
-#: html/main.php:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "w"
 
-#: html/main.php:366
+#: html/main.php:371
 #, fuzzy, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "BŁĄD: Nie można znaleźć żadnych definicji dla pluginu '%s'!"
@@ -6201,79 +6238,79 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Ustaw status"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 #, fuzzy
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 "Ustawienia serwera LDAP zawierają stare definicje schema. Proszę uruchomić "
 "setup."
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Autentykacja Nagios"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "Sesja nie będzie szyfrowana."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "Sprowadź sesję SSL"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6313,6 +6350,50 @@ msgstr ""
 msgid "Smarty"
 msgstr "Podsumowanie"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Odtwórz"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Katalog"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Usuń użytkownika"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "Import powiódł się"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "Opcje poczty"
+
+#, fuzzy
+#~ msgid "Hour"
+#~ msgstr "godzina"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Drukarka"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "dzień"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "miesiąc"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "Szukaj"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Hasło"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Parametr aplikacji"
@@ -6447,10 +6528,6 @@ msgstr "Podsumowanie"
 #~ msgid "sudo role"
 #~ msgstr "! nieznane id"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "Nieznane"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "Ostrzeżenie"
@@ -6495,10 +6572,6 @@ msgstr "Podsumowanie"
 #~ msgid "Flags"
 #~ msgstr "klasa"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Plik konfiguracyjny"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Zarządzanie systemem"
@@ -6692,9 +6765,6 @@ msgstr "Podsumowanie"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Zaznacz aby zobaczyć grupy zawierające użytkowników"
 
-#~ msgid "Applications"
-#~ msgstr "Aplikacje"
-
 #, fuzzy
 #~ msgid "Workstations"
 #~ msgstr "Stacja robocza"
@@ -7525,9 +7595,6 @@ msgstr "Podsumowanie"
 #~ msgid "Schedule"
 #~ msgstr "PHP schedule it"
 
-#~ msgid "Action"
-#~ msgstr "Akcja"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Usuń"
@@ -7645,9 +7712,6 @@ msgstr "Podsumowanie"
 #~ msgid "Services"
 #~ msgstr "Usługi"
 
-#~ msgid "FAI summary"
-#~ msgstr "Podsumowanie FAI"
-
 #~ msgid "OGo"
 #~ msgstr "OGo"
 
@@ -7675,17 +7739,10 @@ msgstr "Podsumowanie"
 #~ msgid "Packages"
 #~ msgstr "Pakiety"
 
-#~ msgid "System logs"
-#~ msgstr "Logi systemowe"
-
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "Usługa Logowania"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Filtruj elementy z tą składnią"
-
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "
 #~ "your php setup."

diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
index 859c17329e988b9a67f64e992fc00438c7173551..55a627b041a4b845fe8a18f78677bd8d3625ad86 100644 (file)
--- a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -66,7 +66,7 @@ msgstr "Текущий пароль"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -98,8 +98,8 @@ msgid "Clear fields"
 msgstr "Очистить поля"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -118,9 +118,10 @@ msgstr "Сменить пароль"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "Сменить пароль"
@@ -131,7 +132,7 @@ msgstr "Для продолжения укажите свой текущий п
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -166,13 +167,13 @@ msgid "You have no permission to change your password."
 msgstr "У вас недостаточно прав для смены своего пароля."
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 #, fuzzy
 msgid "User password"
 msgstr "Новый пароль"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "Моя учетная запись"
@@ -193,11 +194,11 @@ msgid "Remove picture"
 msgstr "Удалить изображение"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -208,27 +209,27 @@ msgstr "Общее"
 msgid "Edit organizational user settings"
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "женский"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -239,64 +240,64 @@ msgstr "мужской"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -306,59 +307,64 @@ msgstr "У выбранного приложения нет параметров
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "У выбранного приложения нет параметров."
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "Имя пользователя"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -371,137 +377,137 @@ msgstr "Имя пользователя"
 msgid "Name"
 msgstr "Фамилия"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "Имя"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "Телефон"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "Факс"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -509,23 +515,23 @@ msgstr "Улица"
 msgid "Role"
 msgstr "Роль"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -535,96 +541,97 @@ msgstr "Пользователи"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "Ветка"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 #, fuzzy
 msgid "Surename"
 msgstr "Имя сервера"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "Организация"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 #, fuzzy
 msgid "Gender"
 msgstr "Отправитель"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -632,51 +639,51 @@ msgstr "Форма трудоустройства"
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "Адм. единица"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 #, fuzzy
 msgid "User certificates"
 msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
@@ -755,7 +762,7 @@ msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -773,44 +780,44 @@ msgstr "Личный телефон"
 msgid "Password storage"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "Настроить"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
@@ -824,7 +831,7 @@ msgstr "Стандартный сертификат"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "Удалить"
@@ -880,6 +887,7 @@ msgstr "Объединения в подразделении"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -913,21 +921,25 @@ msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Выберите системы для добавления"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Показать системы в подразделении"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Показать подходяшие системы"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
@@ -1007,18 +1019,19 @@ msgstr "Показать группы с эл. почтой"
 msgid "Account"
 msgstr "Учетная запись"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "Системные доверия"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 #, fuzzy
 msgid "Trust mode"
 msgstr "Режим"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "Unix"
 
@@ -1039,7 +1052,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 #, fuzzy
 msgid "active"
 msgstr "Личный"
@@ -1070,17 +1083,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "Окружение"
@@ -1110,16 +1123,19 @@ msgstr ""
 "(shadowWarning)"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "отключен"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "полный доступ"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
@@ -1129,19 +1145,18 @@ msgstr "разрешить доступ только на эти хосты"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "Предупреждение"
@@ -1264,7 +1279,7 @@ msgstr "Имя объекта"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1280,66 +1295,65 @@ msgstr "Контакт"
 msgid "This object has no relationship to other objects."
 msgstr "Данный объект не имеет ссылок на другие объекты"
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "Почта"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "Факс"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "Приложение"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "Сервер"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "Тонкий клиент"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "Принтер"
 
@@ -1382,7 +1396,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "Управление подразделениями"
 
@@ -1485,6 +1499,17 @@ msgstr ""
 msgid "List of departments"
 msgstr "Список подразделений"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+#, fuzzy
+msgid "Select all"
+msgstr "Удалить"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 #, fuzzy
@@ -1498,7 +1523,7 @@ msgstr "Управление подразделениями"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1511,7 +1536,7 @@ msgstr "Регулярное выражение, соответствующее
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #, fuzzy
 msgid "Submit department"
@@ -1520,18 +1545,19 @@ msgstr "Показать подразделения"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr ""
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "Создать"
 
@@ -1539,15 +1565,15 @@ msgstr "Создать"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 #, fuzzy
 msgid "edit"
 msgstr "Изменить"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
@@ -1556,15 +1582,15 @@ msgstr "Редактиовать объект"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 #, fuzzy
 msgid "delete"
 msgstr "Удалить"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Удалить"
@@ -1576,8 +1602,8 @@ msgstr "подразделения"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "Подразделение"
@@ -1603,7 +1629,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1631,9 +1657,9 @@ msgid "Moving '%s' to '%s'"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "Объект"
@@ -1677,40 +1703,40 @@ msgstr ""
 msgid "Manage Departments"
 msgstr "Подразделения"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"."
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1718,14 +1744,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "Доступ"
 
@@ -1756,7 +1781,6 @@ msgid "List of acls"
 msgstr "Список групп"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr ""
 
@@ -1767,7 +1791,7 @@ msgstr "Шаблон для групп"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1775,7 +1799,7 @@ msgstr "Компания"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1785,42 +1809,42 @@ msgstr "Выполнить"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr ""
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
@@ -1857,7 +1881,7 @@ msgstr "Параметры доступа"
 msgid "Edit AC roles"
 msgstr "Доступ"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 #, fuzzy
 msgid "All categories"
 msgstr "Категория"
@@ -1867,48 +1891,49 @@ msgstr "Категория"
 msgid "Reset ACL"
 msgstr "Удалить"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 #, fuzzy
 msgid "One level"
 msgstr "Уровень информативности"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 #, fuzzy
 msgid "Current object"
 msgstr "Текущий пароль"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 #, fuzzy
 msgid "Complete subtree"
 msgstr "не полный"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "Изменить"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
@@ -1938,7 +1963,7 @@ msgstr "Категория"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1966,29 +1991,30 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr "Выберите ветку для группы"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 #, fuzzy
 msgid "New ACL"
 msgstr "Создать"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 #, fuzzy
 msgid "ACL type"
 msgstr "Тип"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 #, fuzzy
 msgid "Select an acl type"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "Объединения"
 
@@ -1997,31 +2023,31 @@ msgstr "Объединения"
 msgid "Manage object groups"
 msgstr "Название группы"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Ошибка LDAP:"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "Объект группы"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "Пользователь"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Рабочая станция Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
@@ -2057,7 +2083,7 @@ msgstr "Название группы"
 msgid "Descriptive text for this group"
 msgstr "Описание группы"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
@@ -2068,15 +2094,15 @@ msgid "List of object groups"
 msgstr "Название группы"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2158,8 +2184,7 @@ msgstr "Показать группы"
 msgid "Number of listed object groups"
 msgstr "Название группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2167,129 +2192,137 @@ msgstr "Название группы"
 msgid "Information"
 msgstr "Информация"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "подразделения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "Показать людей"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "приложения"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "серверы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "рабочие станции"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "терминалы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "телефоны"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "приложения"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "слишком много различных объектов!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "пользователи"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Рабочая станция"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 #, fuzzy
 msgid "Non existing dn:"
 msgstr "Не существующий dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 #, fuzzy
 msgid "Object group generic"
 msgstr "Объект группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 #, fuzzy
 msgid "Member"
 msgstr "Включаемые объекты"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 #, fuzzy
 msgid "Phone queue"
 msgstr "Номер телефона"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
 #, fuzzy
-msgid "System"
+msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "Устройства"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "Запуск"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "Приложения"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "Терминалы"
 
@@ -2325,49 +2358,37 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Manage users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "У вас недостаточно прав для удаления этого стоп-листа."
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:564
-#, fuzzy
-msgid "Delete users"
-msgstr "Удалить"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "Delete user"
-msgstr "Удалить"
-
-#: plugins/admin/users/class_userManagement.inc:701
-#, fuzzy
-msgid "User successfully removed."
-msgstr "Настройка завершена"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "Шаблон"
 
@@ -2401,7 +2422,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "Управление пользователями"
 
@@ -2443,7 +2464,7 @@ msgid "functional users"
 msgstr "Показать обычных пользователей"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 #, fuzzy
 msgid "Posix"
@@ -2474,92 +2495,97 @@ msgstr "Показать пользователей с прокси-сервер
 msgid "Display users matching"
 msgstr "Фильтр"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "Шаблон"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 #, fuzzy
 msgid "Create user from template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "Личный"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 #, fuzzy
 msgid "password"
 msgstr "Пароль"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "Сменить пароль"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+#, fuzzy
+msgid "Delete user"
+msgstr "Удалить"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 #, fuzzy
 msgid "Number of listed users"
 msgstr "Подразделение"
@@ -2580,7 +2606,7 @@ msgstr ""
 msgid "Strength"
 msgstr "Улица"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "Управление группами"
 
@@ -2659,18 +2685,18 @@ msgstr "Члены группы"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -2727,7 +2753,7 @@ msgid "Generic group settings"
 msgstr "Общая информация о пользователе"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "Группы"
 
@@ -2765,8 +2791,8 @@ msgstr "Samba"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "группы"
@@ -2819,7 +2845,7 @@ msgstr "Выберите, чтобы просмотреть список обы
 msgid "functional groups"
 msgstr "Показать обычные группы"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "Название группы"
@@ -2829,26 +2855,26 @@ msgstr "Название группы"
 msgid "Group settings"
 msgstr "Настройки Samba"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "Почтовые настройки пользователя"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "Изменить параметры"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 #, fuzzy
 msgid "No"
 msgstr "нет"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 #, fuzzy
@@ -2937,9 +2963,9 @@ msgstr "Поиск"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "Применить"
@@ -2947,15 +2973,14 @@ msgstr "Применить"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "Отмена"
@@ -3316,40 +3341,55 @@ msgstr "Создать телефонный аккаунт"
 msgid "Government mode"
 msgstr "в папку"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "состояние неизвестно"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "Системные журналы"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Ошибка LDAP:"
+
+#: setup/setup_config2.tpl:193
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 #, fuzzy
 msgid "Mail method"
 msgstr "Почтовые настройки"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Шаблон рабочей станции"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Приложение"
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Создать настройки запись эл. почты"
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Приложение"
@@ -3481,13 +3521,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-#, fuzzy
-msgid "Select all"
-msgstr "Удалить"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3617,25 +3650,25 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 #, fuzzy
 msgid "LDAP inspection"
 msgstr "Проверка конфигурации PHP"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 #, fuzzy
 msgid "Checking for root object"
 msgstr "Проверка модуля gd"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "Проверка поддержки gettext"
@@ -3660,48 +3693,48 @@ msgstr "Проверка модуля cups"
 msgid "Checking for groups outside the groups tree"
 msgstr "Проверка модуля cups"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "Проверка поддержки gettext"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "Проверка поддержки gettext"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Укажите корректный номер телефона."
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3711,157 +3744,157 @@ msgstr "Укажите корректный номер телефона."
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Укажите корректный номер телефона."
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "Ошибка"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 #, fuzzy
 msgid "Migrate"
 msgstr "Дата"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, fuzzy, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Вы собираетесь удалить объект %s."
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 #, fuzzy
 msgid "Move"
 msgstr "Режим"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "Дата"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Список подразделений"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "Срок действия пароля истекает"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "Ошибка LDAP:"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "Введите корректное имя пользователя!"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 #, fuzzy
 msgid "Try to create root object"
 msgstr "Объект группы"
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Ошибка при выполнении \"%s\"!"
@@ -4007,11 +4040,6 @@ msgstr "Настройки Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Ошибка LDAP:"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4309,7 +4337,7 @@ msgid ""
 "choose the dummy plugin to leave all your mail settings untouched."
 msgstr ""
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "Состояние системы"
@@ -4319,81 +4347,81 @@ msgstr "Состояние системы"
 msgid "Completed"
 msgstr "не полный"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 #, fuzzy
 msgid "UNIX accounts/groups"
 msgstr "UNIX аккаунт"
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 #, fuzzy
 msgid "Samba management"
 msgstr "Управление системами"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 #, fuzzy
 msgid "Mailsystem management"
 msgstr "Управление системами"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 #, fuzzy
 msgid "FAX system administration"
 msgstr "Управление пользователями"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 #, fuzzy
 msgid "Asterisk administration"
 msgstr "Управление пользователями"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 #, fuzzy
 msgid "System inventory"
 msgstr "Удалить объект"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 #, fuzzy
 msgid "System-/Configmanagement"
 msgstr "Управление системами"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "Адресная книга"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 #, fuzzy
 msgid "Notification and feedback"
 msgstr "Изменить сертификаты"
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 #, fuzzy
 msgid "Get notifications or send feedback"
 msgstr "Местоположение ветки"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 #, fuzzy
 msgid "Feedback sucessfully send"
 msgstr "Настройка завершена"
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "Введите корректное имя пользователя!"
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4509,18 +4537,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 #, fuzzy
 msgid "from"
 msgstr "и"
@@ -4548,12 +4576,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
@@ -4568,12 +4596,12 @@ msgstr "Удалить"
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Создать телефонный аккаунт"
@@ -4852,7 +4880,6 @@ msgstr "Удалить параметры"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "Сохранить"
@@ -5094,47 +5121,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr "Описание группы"
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Описание группы"
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Список подразделений"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Удалить"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "Проверка поддержки gettext"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5151,49 +5183,55 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 #, fuzzy
 msgid "Go to root department"
 msgstr "Список подразделений"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 #, fuzzy
 msgid "Root"
 msgstr "Перезагрузить"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 #, fuzzy
 msgid "Go up one department"
 msgstr "Подразделение"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 #, fuzzy
 msgid "Go to users department"
 msgstr "Выберите подразделение"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 #, fuzzy
 msgid "Home"
 msgstr "Имя системы"
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 #, fuzzy
 msgid "Restore"
 msgstr "Повторить"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -5211,6 +5249,11 @@ msgstr "Объект группы"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5225,57 +5268,68 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, fuzzy, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Ошибка XML в gosa.conf: %s в строке %d"
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 #, fuzzy
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "Настроить"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5283,17 +5337,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Удалить"
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "состояние неизвестно"
@@ -5313,15 +5367,45 @@ msgstr "Срок действия пароля истекает"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "Ссылки"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "Выберите, чтобы просмотреть серверы"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "Пользователь"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "Действие"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "Показать подходяшие адреса"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Выберите, чтобы просмотреть серверы"
+
 #: include/functions_helpviewer.inc:45
 #, fuzzy, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5350,67 +5434,67 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 #, fuzzy
 msgid "Send bugreport"
 msgstr "Отправитель"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 #, fuzzy
 msgid "Toggle information"
 msgstr "Личная информация"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 #, fuzzy
 msgid "PHP error"
 msgstr "Ошибка LDAP:"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr ""
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 #, fuzzy
 msgid "function"
 msgstr "Действие"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 #, fuzzy
 msgid "static"
 msgstr "Состояние"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 #, fuzzy
 msgid "method"
 msgstr "Почтовые настройки"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr ""
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 #, fuzzy
 msgid "File"
 msgstr "Файлы"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 #, fuzzy
 msgid "Line"
 msgstr "в"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "Тип"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 #, fuzzy
 msgid "Arguments"
 msgstr "подразделения"
@@ -5420,12 +5504,12 @@ msgstr "подразделения"
 msgid "All objects in this category"
 msgstr "Описание группы"
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
@@ -5474,29 +5558,29 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "Невозможно подключиться к серверу базы данных!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, fuzzy, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -5504,11 +5588,11 @@ msgid ""
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -5517,12 +5601,12 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-сервер"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -5531,12 +5615,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5545,174 +5629,174 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Продолжить"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь удалить объект %s."
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Удалить"
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 msgid "'base_hook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Экспорт в LDIF"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "Немецкий"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "Французский"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "Испанский"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "Английский"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "Датский"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 #, fuzzy
 msgid "Polish"
 msgstr "Английский"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 #, fuzzy
 msgid "Chinese"
 msgstr "сброс"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "Русский"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5721,131 +5805,133 @@ msgstr ""
 msgid "Access control"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 #, fuzzy
 msgid "No ACL settings for this category!"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "Категория"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "Настройки телефона"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 #, fuzzy
 msgid "Create objects"
 msgstr "Объект группы"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 #, fuzzy
 msgid "Move objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 #, fuzzy
 msgid "Remove objects"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 #, fuzzy
 msgid "Move object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 #, fuzzy
 msgid "Remove object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "чтение"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "запись"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 #, fuzzy
 msgid "Complete object"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "Роль"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "состояние неизвестно"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, fuzzy, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 #, fuzzy
 msgid "Members"
 msgstr "Включаемые объекты"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 #, fuzzy
 msgid "Access control list"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 #, fuzzy
 msgid "ACL roles"
 msgstr "Доступ"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 #, fuzzy
 msgid "Role name"
 msgstr "Имя сервера"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 #, fuzzy
 msgid "Role description"
 msgstr "Описание подразделения"
@@ -5923,29 +6009,34 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Войти"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "Дополнительные записи в fstab"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 #, fuzzy
 msgid "Available members"
 msgstr "Доступные приложения"
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "Проверка модуля gd"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 #, fuzzy
 msgid "Available roles"
 msgstr "Доступные приложения"
@@ -6209,76 +6300,17 @@ msgstr "Новый пароль"
 msgid "Change"
 msgstr "Канал"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "Почтовые настройки"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-#, fuzzy
-msgid "Hour"
-msgstr "час"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "Принтер"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "день"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "месяц"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "Поиск"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "Пароль"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "Базы данных"
 
-#: html/main.php:172
+#: html/main.php:173
 #, fuzzy
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
@@ -6287,21 +6319,25 @@ msgstr ""
 "Используется механизм register_globals. GOsa не допустит пользователей в "
 "систему, пока он не будет отключен администратором."
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: html/main.php:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "в"
 
-#: html/main.php:366
+#: html/main.php:371
 #, fuzzy, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
@@ -6317,79 +6353,79 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Не удается прочитать файл настройки GOsa %s/gosa.conf. Операция прервана."
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "Состояние системы"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, fuzzy, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Рабочая станция Windows"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6426,6 +6462,50 @@ msgstr ""
 msgid "Smarty"
 msgstr "Запуск"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "Повторить"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "Каталог"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "Настройка завершена"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "Почтовые настройки"
+
+#, fuzzy
+#~ msgid "Hour"
+#~ msgstr "час"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Принтер"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "день"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "месяц"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "Поиск"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "Пароль"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "Приложение"
@@ -6572,10 +6652,6 @@ msgstr "Запуск"
 #~ msgid "sudo role"
 #~ msgstr "состояние неизвестно"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "состояние неизвестно"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "Предупреждение"
@@ -6604,10 +6680,6 @@ msgstr "Запуск"
 #~ msgid "Sudo role administration"
 #~ msgstr "Управление группами"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "Настроить"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "Управление системами"
@@ -6788,9 +6860,6 @@ msgstr "Запуск"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "Показать группы с пользователями"
 
-#~ msgid "Applications"
-#~ msgstr "Приложения"
-
 #, fuzzy
 #~ msgid "Workstations"
 #~ msgstr "Рабочая станция"
@@ -7614,9 +7683,6 @@ msgstr "Запуск"
 #~ msgid "Schedule"
 #~ msgstr "Учетная запись Groupware"
 
-#~ msgid "Action"
-#~ msgstr "Действие"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "Удалить"
@@ -7751,17 +7817,10 @@ msgstr "Запуск"
 #~ msgid "Packages"
 #~ msgstr "Показать телефоны"
 
-#~ msgid "System logs"
-#~ msgstr "Системные журналы"
-
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "Служба печати"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "Показать подходяшие адреса"
-
 #, fuzzy
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "

diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
index 614973d4b596fd06e4f87d30a5724bdb8dfe3d89..64c44ccc804bc574ebb313c4522188d4e9368fea 100644 (file)
--- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 16:00+0200\n"
+"POT-Creation-Date: 2008-05-27 11:08+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "当前口令"
 #: plugins/personal/password/password.tpl:18
 #: plugins/personal/generic/main.inc:86
 #: plugins/personal/generic/password.tpl:7
-#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:264
 #: plugins/admin/users/password.tpl:13
 #: ihtml/themes/default/accountexpired.tpl:32
 #: ihtml/themes/default/accountexpired.tpl:36
@@ -92,8 +92,8 @@ msgid "Clear fields"
 msgstr "清除字段"
 
 #: plugins/personal/password/class_password.inc:26
-#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:282
-#: setup/setup_config2.tpl:327 setup/setup_migrate.tpl:225
+#: plugins/personal/generic/paste_generic.tpl:20 setup/setup_config2.tpl:295
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:39
 msgid "Password"
@@ -112,9 +112,10 @@ msgstr "修改口令"
 #: plugins/personal/password/class_password.inc:94
 #: plugins/personal/password/class_password.inc:108
 #: plugins/personal/password/class_password.inc:114
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
-#: ihtml/themes/default/password.tpl:40 html/main.php:356
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
+#: plugins/admin/users/class_userManagement.inc:633
+#: ihtml/themes/default/password.tpl:40 html/main.php:361
 #, fuzzy
 msgid "Password change"
 msgstr "不允许修改口令"
@@ -125,7 +126,7 @@ msgstr "您需要输入当前口令才能继续。"
 
 #: plugins/personal/password/class_password.inc:83
 #: plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:257 html/password.php:197
+#: plugins/admin/users/class_userManagement.inc:259 html/password.php:197
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -160,13 +161,13 @@ msgid "You have no permission to change your password."
 msgstr "您无权修改您的口令。"
 
 #: plugins/personal/password/class_password.inc:142
-#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/class_user.inc:1488
 #, fuzzy
 msgid "User password"
 msgstr "清除口令"
 
 #: plugins/personal/password/class_password.inc:146
-#: plugins/personal/generic/class_user.inc:1457
+#: plugins/personal/generic/class_user.inc:1482
 #: plugins/personal/posix/class_posixAccount.inc:1498
 msgid "My account"
 msgstr "我的账号"
@@ -187,11 +188,11 @@ msgid "Remove picture"
 msgstr "删除图片"
 
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1452
+#: plugins/personal/generic/class_user.inc:1477
 #: plugins/personal/posix/generic.tpl:4
-#: plugins/generic/references/class_reference.inc:40
+#: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/departments/class_departmentGeneric.inc:527
-#: plugins/admin/ogroups/class_ogroup.inc:807
+#: plugins/admin/ogroups/class_ogroup.inc:1042
 #: plugins/admin/groups/class_groupGeneric.inc:1202
 #: setup/setup_feedback.tpl:46
 msgid "Generic"
@@ -202,27 +203,27 @@ msgstr "通用配置"
 msgid "Edit organizational user settings"
 msgstr "应用程序设置"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "female"
 msgstr "女"
 
-#: plugins/personal/generic/class_user.inc:299
+#: plugins/personal/generic/class_user.inc:304
 msgid "male"
 msgstr "男"
 
-#: plugins/personal/generic/class_user.inc:397
-#: plugins/personal/generic/class_user.inc:498
-#: plugins/personal/generic/class_user.inc:772
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:402
+#: plugins/personal/generic/class_user.inc:503
+#: plugins/personal/generic/class_user.inc:786
+#: plugins/personal/generic/class_user.inc:1327
 #: plugins/personal/generic/main.inc:104
 #: plugins/personal/posix/class_posixAccount.inc:1319
 #: plugins/admin/groups/class_groupGeneric.inc:916
 #: plugins/admin/groups/class_groupGeneric.inc:921
 #: plugins/admin/groups/class_groupGeneric.inc:1154
-#: setup/class_setupStep_Migrate.inc:1037 setup/setup_checks.tpl:30
+#: setup/class_setupStep_Migrate.inc:1051 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91 include/class_plugin.inc:643
 #: include/class_plugin.inc:680 include/class_plugin.inc:718
-#: include/class_plugin.inc:1434 include/class_CopyPasteHandler.inc:118
+#: include/class_plugin.inc:1557 include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:126
 #: include/class_CopyPasteHandler.inc:158
 #: include/class_CopyPasteHandler.inc:175
@@ -233,63 +234,63 @@ msgstr "男"
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:465 include/utils/class_msgPool.inc:484
 #: include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:141
-#: include/class_gosaSupportDaemon.inc:1089
-#: include/class_gosaSupportDaemon.inc:1109 include/class_log.inc:145
+#: include/password-methods/class_password-methods.inc:145
+#: include/class_gosaSupportDaemon.inc:1177
+#: include/class_gosaSupportDaemon.inc:1197 include/class_log.inc:145
 #: include/class_log.inc:157 include/class_log.inc:165
 #: include/class_log.inc:177 include/class_log.inc:192
 #: include/class_log.inc:205 include/class_log.inc:228
 #: ihtml/themes/default/msg_dialog.tpl:55
-#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:225
-#: html/index.php:229
+#: ihtml/themes/default/msg_dialog.tpl:100 html/index.php:226
+#: html/index.php:230
 #, php-format
 msgid "Error"
 msgstr "错误"
 
-#: plugins/personal/generic/class_user.inc:397
+#: plugins/personal/generic/class_user.inc:402
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:498
+#: plugins/personal/generic/class_user.inc:503
 #, fuzzy
 msgid "Serial number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:543
+#: 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:553
+#: plugins/personal/generic/class_user.inc:558
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "证书从 %s 到 %s 是有效的，当前为 %s。"
 
-#: plugins/personal/generic/class_user.inc:556
+#: plugins/personal/generic/class_user.inc:561
 msgid "valid"
 msgstr "有效"
 
-#: plugins/personal/generic/class_user.inc:557
+#: plugins/personal/generic/class_user.inc:562
 msgid "invalid"
 msgstr "无效"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:567
 msgid "No certificate installed"
 msgstr "未安装证书"
 
-#: plugins/personal/generic/class_user.inc:588 html/password.php:163
+#: plugins/personal/generic/class_user.inc:592 html/password.php:163
 #, fuzzy
 msgid "Password method"
 msgstr "口令存储"
 
-#: plugins/personal/generic/class_user.inc:588
+#: plugins/personal/generic/class_user.inc:592
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:688
-#: plugins/personal/generic/class_user.inc:1026
+#: plugins/personal/generic/class_user.inc:702
+#: plugins/personal/generic/class_user.inc:1037
 #: plugins/personal/posix/class_posixAccount.inc:663
 #: plugins/personal/posix/class_posixAccount.inc:927
 #: plugins/admin/departments/class_departmentGeneric.inc:186
@@ -299,59 +300,64 @@ msgstr "此应用程序不再可用。"
 #: plugins/admin/acl/class_aclRole.inc:585
 #: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/acl/class_aclRole.inc:639
-#: plugins/admin/ogroups/class_ogroup.inc:731
-#: plugins/admin/ogroups/class_ogroup.inc:745
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:955
+#: plugins/admin/ogroups/class_ogroup.inc:969
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/groups/class_groupGeneric.inc:720
 #: plugins/admin/groups/class_groupGeneric.inc:1032
-#: setup/class_setupStep_Migrate.inc:1048
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
-#: setup/class_setupStep_Migrate.inc:1939
-#: setup/class_setupStep_Migrate.inc:1943 include/class_plugin.inc:1107
-#: include/class_plugin.inc:1156 include/class_plugin.inc:1160
-#: include/class_plugin.inc:1237 include/class_plugin.inc:1295
-#: include/class_plugin.inc:1361 include/class_plugin.inc:1378
-#: include/class_MultiSelectWindow.inc:529 include/class_ldap.inc:648
-#: include/class_ldap.inc:1114 include/class_config.inc:228
-#: include/functions.inc:343 include/functions.inc:370
-#: include/functions.inc:379 include/functions.inc:408
-#: include/functions.inc:619 include/functions.inc:651
-#: include/functions.inc:690 include/functions.inc:735
-#: include/functions.inc:2509 include/functions.inc:2716
-#: include/class_acl.inc:1082 html/index.php:255 html/index.php:269
-#: html/index.php:282
+#: setup/class_setupStep_Migrate.inc:1062
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:1959 include/class_plugin.inc:902
+#: include/class_plugin.inc:1230 include/class_plugin.inc:1279
+#: include/class_plugin.inc:1283 include/class_plugin.inc:1360
+#: include/class_plugin.inc:1418 include/class_plugin.inc:1484
+#: include/class_plugin.inc:1501 include/class_MultiSelectWindow.inc:530
+#: include/class_ldap.inc:693 include/class_ldap.inc:1159
+#: include/class_config.inc:242 include/functions.inc:344
+#: include/functions.inc:371 include/functions.inc:380
+#: include/functions.inc:409 include/functions.inc:620
+#: include/functions.inc:652 include/functions.inc:691
+#: include/functions.inc:736 include/functions.inc:2524
+#: include/functions.inc:2736 include/class_acl.inc:1144 html/index.php:256
+#: html/index.php:270 html/index.php:283
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: plugins/personal/generic/class_user.inc:1144
-#: plugins/personal/generic/class_user.inc:1156
-#: plugins/personal/generic/class_user.inc:1170
-#: plugins/personal/generic/class_user.inc:1172
+#: plugins/personal/generic/class_user.inc:1149
+#, fuzzy
+msgid "The selected password method requires initial configuration!"
+msgstr "此应用程序不再可用。"
+
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1195
+#: plugins/personal/generic/class_user.inc:1197
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32 html/password.php:219
 msgid "Login"
 msgstr "登录名"
 
-#: plugins/personal/generic/class_user.inc:1150
-#: plugins/personal/generic/class_user.inc:1161
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1175
+#: plugins/personal/generic/class_user.inc:1186
+#: plugins/personal/generic/class_user.inc:1223
+#: plugins/personal/generic/class_user.inc:1613
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #: plugins/admin/departments/class_departmentGeneric.inc:242
 #: plugins/admin/departments/class_departmentGeneric.inc:247
 #: plugins/admin/departments/class_departmentGeneric.inc:254
 #: plugins/admin/departments/class_departmentGeneric.inc:258
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:659
-#: plugins/admin/ogroups/class_ogroup.inc:669
-#: plugins/admin/ogroups/class_ogroup.inc:816
-#: plugins/admin/users/class_userManagement.inc:795
-#: plugins/admin/users/class_userManagement.inc:873
-#: plugins/admin/users/class_userManagement.inc:885
+#: plugins/admin/acl/acl_role.tpl:7 plugins/admin/ogroups/class_ogroup.inc:852
+#: plugins/admin/ogroups/class_ogroup.inc:862
+#: plugins/admin/ogroups/class_ogroup.inc:1051
+#: plugins/admin/users/class_userManagement.inc:752
+#: plugins/admin/users/class_userManagement.inc:830
+#: plugins/admin/users/class_userManagement.inc:842
 #: plugins/admin/groups/class_groupGeneric.inc:1059
 #: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/groups/class_groupGeneric.inc:1067
@@ -364,137 +370,137 @@ msgstr "登录名"
 msgid "Name"
 msgstr "名称"
 
-#: plugins/personal/generic/class_user.inc:1153
-#: plugins/personal/generic/class_user.inc:1195
-#: plugins/personal/generic/class_user.inc:1465
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/users/class_userManagement.inc:876
+#: plugins/personal/generic/class_user.inc:1178
+#: plugins/personal/generic/class_user.inc:1220
+#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1610
+#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:833
 msgid "Given name"
 msgstr "名"
 
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1471
-#: plugins/personal/generic/class_user.inc:1570
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1496
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic.tpl:210
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/personal/generic/class_user.inc:1573
-#: plugins/personal/generic/generic.tpl:330
-#: plugins/personal/generic/generic.tpl:511
+#: plugins/personal/generic/class_user.inc:1206
+#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:513
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
-#: plugins/generic/references/class_reference.inc:60
+#: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_departmentGeneric.inc:261
-#: plugins/admin/ogroups/class_ogroupManagement.inc:503
-#: plugins/admin/users/class_divListUsers.inc:276
+#: plugins/admin/ogroups/class_ogroupManagement.inc:516
+#: plugins/admin/users/class_divListUsers.inc:280
 #: plugins/admin/groups/class_divListGroup.inc:269
 msgid "Phone"
 msgstr "电话"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/generic.tpl:523
+#: plugins/personal/generic/class_user.inc:1209
+#: plugins/personal/generic/class_user.inc:1601
+#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:264
 #: plugins/admin/departments/class_departmentGeneric.inc:546
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:282
 msgid "Fax"
 msgstr "传真"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/class_user.inc:1579
-#: plugins/personal/generic/generic.tpl:339
+#: plugins/personal/generic/class_user.inc:1212
+#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/generic.tpl:341
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:347
+#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/generic.tpl:349
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1327
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "无法打开指定证书！"
 
-#: plugins/personal/generic/class_user.inc:1437
-#: plugins/personal/generic/generic.tpl:463
+#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/generic.tpl:465
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "单元"
 
-#: plugins/personal/generic/class_user.inc:1438
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1463
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "家庭角色"
 
-#: plugins/personal/generic/class_user.inc:1439
-#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/generic.tpl:407
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "行业"
 
-#: plugins/personal/generic/class_user.inc:1440
-#: plugins/personal/generic/generic.tpl:532
+#: plugins/personal/generic/class_user.inc:1465
+#: plugins/personal/generic/generic.tpl:534
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "最后传递"
 
-#: plugins/personal/generic/class_user.inc:1441
-#: plugins/personal/generic/generic.tpl:454
+#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/generic.tpl:456
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1442
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/generic.tpl:415
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "单元描述"
 
-#: plugins/personal/generic/class_user.inc:1443
-#: plugins/personal/generic/generic.tpl:422
+#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/generic.tpl:424
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1444
-#: plugins/personal/generic/generic.tpl:431
+#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/generic.tpl:433
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "单位职称"
 
-#: plugins/personal/generic/class_user.inc:1445
+#: plugins/personal/generic/class_user.inc:1470
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/generic/class_user.inc:1446
-#: plugins/personal/generic/generic.tpl:541
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/generic.tpl:543
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/class_user.inc:1447
-#: plugins/personal/generic/generic.tpl:472
+#: plugins/personal/generic/class_user.inc:1472
+#: plugins/personal/generic/generic.tpl:474
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "街道"
 
-#: plugins/personal/generic/class_user.inc:1448
-#: plugins/personal/generic/generic.tpl:440
+#: plugins/personal/generic/class_user.inc:1473
+#: plugins/personal/generic/generic.tpl:442
 #: plugins/personal/generic/multiple_generic.tpl:345
 #: plugins/admin/acl/class_divListACL.inc:166
 #: plugins/admin/acl/class_divListACL.inc:225
@@ -502,23 +508,23 @@ msgstr "街道"
 msgid "Role"
 msgstr "角色"
 
-#: plugins/personal/generic/class_user.inc:1449
-#: plugins/personal/generic/generic.tpl:480
+#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/generic.tpl:482
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:1453
+#: plugins/personal/generic/class_user.inc:1478
 #, fuzzy
 msgid "Generic user settings"
 msgstr "通用队列设置"
 
-#: plugins/personal/generic/class_user.inc:1458
-#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:216
+#: plugins/personal/generic/class_user.inc:1483
+#: plugins/admin/users/class_userManagement.inc:26 include/class_acl.inc:218
 msgid "Users"
 msgstr "用户"
 
-#: plugins/personal/generic/class_user.inc:1462
+#: plugins/personal/generic/class_user.inc:1487
 #: plugins/personal/generic/generic.tpl:170
 #: plugins/personal/generic/multiple_generic.tpl:47
 #: plugins/admin/departments/generic.tpl:35
@@ -528,95 +534,96 @@ msgstr "用户"
 #: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl_role.tpl:27
 #: plugins/admin/ogroups/generic.tpl:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:193
-#: plugins/admin/ogroups/class_ogroup.inc:817
-#: plugins/admin/users/class_divListUsers.inc:162
+#: plugins/admin/ogroups/class_ogroup.inc:1052
+#: plugins/admin/users/class_divListUsers.inc:161
 #: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/class_groupGeneric.inc:1212
 #: plugins/admin/groups/class_divListGroup.inc:175 setup/setup_ldap.tpl:55
+#: include/class_baseSelectDialog.inc:65
 msgid "Base"
 msgstr "位置"
 
-#: plugins/personal/generic/class_user.inc:1464
+#: plugins/personal/generic/class_user.inc:1489
 msgid "Surename"
 msgstr "姓"
 
-#: plugins/personal/generic/class_user.inc:1466
+#: plugins/personal/generic/class_user.inc:1491
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: plugins/personal/generic/class_user.inc:1467
+#: plugins/personal/generic/class_user.inc:1492
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1468
+#: plugins/personal/generic/class_user.inc:1493
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1469
+#: plugins/personal/generic/class_user.inc:1494
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:1470
+#: plugins/personal/generic/class_user.inc:1495
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1472
-#: plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/class_user.inc:1497
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:149
 #: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr "组织/公司"
 
-#: plugins/personal/generic/class_user.inc:1473
-#: plugins/personal/generic/generic.tpl:279
+#: plugins/personal/generic/class_user.inc:1498
+#: plugins/personal/generic/generic.tpl:281
 #: plugins/personal/generic/multiple_generic.tpl:159
-#: plugins/generic/references/class_reference.inc:58
+#: plugins/generic/references/class_reference.inc:59
 #: plugins/admin/departments/class_divListDepartment.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#: plugins/admin/ogroups/class_ogroupManagement.inc:514
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/users/class_divListUsers.inc:80
 #: plugins/admin/groups/class_divListGroup.inc:79
 msgid "Department"
 msgstr "部门"
 
-#: plugins/personal/generic/class_user.inc:1474
+#: plugins/personal/generic/class_user.inc:1499
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "生日"
 
-#: plugins/personal/generic/class_user.inc:1475
+#: plugins/personal/generic/class_user.inc:1500
 #, fuzzy
 msgid "Gender"
 msgstr "发送者"
 
-#: plugins/personal/generic/class_user.inc:1476
+#: plugins/personal/generic/class_user.inc:1501
 #, fuzzy
 msgid "Preferred language"
 msgstr "首选语种"
 
-#: plugins/personal/generic/class_user.inc:1477
+#: plugins/personal/generic/class_user.inc:1502
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
-#: plugins/personal/generic/class_user.inc:1478
+#: plugins/personal/generic/class_user.inc:1503
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1479
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/class_user.inc:1504
+#: plugins/personal/generic/generic.tpl:305
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1480
-#: plugins/personal/generic/generic.tpl:373
+#: plugins/personal/generic/class_user.inc:1505
+#: plugins/personal/generic/generic.tpl:375
 #: plugins/personal/generic/multiple_generic.tpl:265
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -624,49 +631,49 @@ msgstr "员工类别"
 msgid "Location"
 msgstr "位置"
 
-#: plugins/personal/generic/class_user.inc:1481
-#: plugins/personal/generic/generic.tpl:381
+#: plugins/personal/generic/class_user.inc:1506
+#: plugins/personal/generic/generic.tpl:383
 #: plugins/personal/generic/multiple_generic.tpl:275
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:543
 msgid "State"
 msgstr "州/省"
 
-#: plugins/personal/generic/class_user.inc:1482
+#: plugins/personal/generic/class_user.inc:1507
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "用户图片"
 
-#: plugins/personal/generic/class_user.inc:1483
+#: plugins/personal/generic/class_user.inc:1508
 #, fuzzy
 msgid "Room number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1484
+#: plugins/personal/generic/class_user.inc:1509
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1510
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1486
+#: plugins/personal/generic/class_user.inc:1511
 #, fuzzy
 msgid "Pager number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1487
+#: plugins/personal/generic/class_user.inc:1512
 #, fuzzy
 msgid "User certificates"
 msgstr "编辑证书"
 
-#: plugins/personal/generic/class_user.inc:1489
+#: plugins/personal/generic/class_user.inc:1514
 msgid "Postal address"
 msgstr "地址"
 
-#: plugins/personal/generic/class_user.inc:1490
+#: plugins/personal/generic/class_user.inc:1515
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
@@ -740,7 +747,7 @@ msgid "Select a base"
 msgstr "选择一个位置"
 
 #: plugins/personal/generic/generic.tpl:194
-#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/generic.tpl:391
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 #: plugins/admin/departments/generic.tpl:76
@@ -758,44 +765,44 @@ msgstr "私人电话"
 msgid "Password storage"
 msgstr "口令存储"
 
-#: plugins/personal/generic/generic.tpl:230 include/functions.inc:1009
+#: plugins/personal/generic/generic.tpl:232 include/functions.inc:1010
 msgid "Configure"
 msgstr "配置"
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:240
 #: plugins/personal/generic/multiple_generic.tpl:117
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "证书"
 
-#: plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:243
 #: plugins/personal/generic/multiple_generic.tpl:121
 msgid "Edit certificates"
 msgstr "编辑证书"
 
-#: plugins/personal/generic/generic.tpl:259
+#: plugins/personal/generic/generic.tpl:261
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/generic.tpl:295
+#: plugins/personal/generic/generic.tpl:297
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/generic.tpl:321
-#: plugins/personal/generic/generic.tpl:503
+#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:505
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/generic.tpl:517
+#: plugins/personal/generic/generic.tpl:519
 msgid "Please use the phone tab"
 msgstr "请使用电话页面"
 
@@ -809,7 +816,7 @@ msgstr "标准证书"
 #: plugins/admin/departments/class_divListDepartment.inc:160
 #: plugins/admin/acl/class_divListACL.inc:172
 #: plugins/admin/ogroups/class_divListOGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:186
 #: plugins/admin/groups/class_divListGroup.inc:197
 msgid "Remove"
 msgstr "删除"
@@ -861,6 +868,7 @@ msgstr "显示部门的组"
 
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/groups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
@@ -894,21 +902,25 @@ msgid "Search in subtrees"
 msgstr "在子树中查找"
 
 #: plugins/personal/posix/trust_machines.tpl:6
+#: plugins/admin/ogroups/trust_machines.tpl:6
 #: plugins/admin/groups/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "选择要添加的系统"
 
 #: plugins/personal/posix/trust_machines.tpl:26
+#: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "显示部门的系统"
 
 #: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "显示匹配的系统"
 
 #: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/trust_machines.tpl:31
 #: plugins/admin/groups/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "匹配地址的正则表达式"
@@ -987,17 +999,18 @@ msgstr "显示邮件组"
 msgid "Account"
 msgstr "账户"
 
-#: plugins/personal/posix/generic.tpl:125
+#: plugins/personal/posix/generic.tpl:125 plugins/admin/ogroups/generic.tpl:41
 msgid "System trust"
 msgstr "信赖的系统"
 
 #: plugins/personal/posix/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:155 plugins/admin/groups/generic.tpl:168
+#: plugins/personal/posix/generic.tpl:155 plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/groups/generic.tpl:168
 msgid "Trust mode"
 msgstr "信赖模式"
 
 #: plugins/personal/posix/class_posixAccount.inc:37
-#: plugins/generic/references/class_reference.inc:42
+#: plugins/generic/references/class_reference.inc:43
 msgid "UNIX"
 msgstr "UNIX"
 
@@ -1017,7 +1030,7 @@ msgstr "时间限制激活"
 #: plugins/personal/posix/class_posixAccount.inc:159
 #: plugins/personal/posix/class_posixAccount.inc:161
 #: plugins/personal/posix/class_posixAccount.inc:163
-#: plugins/admin/users/class_divListUsers.inc:323
+#: plugins/admin/users/class_divListUsers.inc:333
 msgid "active"
 msgstr "活动"
 
@@ -1047,17 +1060,17 @@ msgid "POSIX"
 msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/generic/references/class_reference.inc:46
-#: plugins/generic/references/class_reference.inc:48
+#: plugins/generic/references/class_reference.inc:47
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:280
+#: plugins/admin/users/class_divListUsers.inc:284
 #: plugins/admin/groups/class_divListGroup.inc:265
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/personal/posix/class_posixAccount.inc:295
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-#: plugins/admin/users/class_divListUsers.inc:272
+#: plugins/admin/ogroups/tabs_ogroups.inc:185
+#: plugins/admin/users/class_divListUsers.inc:276
 #: plugins/admin/groups/class_divListGroup.inc:271
 msgid "Environment"
 msgstr "环境设置"
@@ -1083,16 +1096,19 @@ msgid "Warn user %s days before password expiery"
 msgstr "在口令过期 %s 天之前警告用户"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
-#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:188
+#: plugins/admin/ogroups/class_ogroup.inc:524
+#: plugins/admin/groups/class_groupGeneric.inc:494 setup/setup_config2.tpl:201
 msgid "disabled"
 msgstr "禁用"
 
 #: plugins/personal/posix/class_posixAccount.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:524
 #: plugins/admin/groups/class_groupGeneric.inc:494
 msgid "full access"
 msgstr "完全访问权限"
 
 #: plugins/personal/posix/class_posixAccount.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:525
 #: plugins/admin/groups/class_groupGeneric.inc:495
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
@@ -1102,19 +1118,18 @@ msgstr "允许访问这些主机"
 #: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/users/class_userManagement.inc:592
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:607
 #: plugins/admin/users/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: setup/class_setupStep_Migrate.inc:214 setup/class_setupStep_Migrate.inc:266
-#: setup/class_setupStep_Migrate.inc:397 setup/class_setupStep_Migrate.inc:474
-#: setup/class_setupStep_Migrate.inc:613 setup/class_setupStep_Migrate.inc:743
+#: setup/class_setupStep_Migrate.inc:215 setup/class_setupStep_Migrate.inc:267
+#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:616 setup/class_setupStep_Migrate.inc:757
 #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: include/class_tabs.inc:216 include/functions.inc:698
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186 ihtml/themes/default/islocked.tpl:6
+#: include/class_tabs.inc:238 include/functions.inc:699
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:102 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:57 html/index.php:63 html/index.php:419 html/index.php:425
+#: html/index.php:57 html/index.php:63 html/index.php:420 html/index.php:426
 #: html/password.php:284
 msgid "Warning"
 msgstr "警告"
@@ -1234,7 +1249,7 @@ msgstr "对象名称"
 #: plugins/admin/departments/class_departmentGeneric.inc:536
 #: plugins/admin/acl/class_aclRole.inc:705 plugins/admin/acl/acl_role.tpl:17
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:818
+#: plugins/admin/ogroups/class_ogroup.inc:1053
 #: plugins/admin/groups/generic.tpl:24
 #: plugins/admin/groups/class_groupGeneric.inc:1213
 #: include/class_SnapShotDialog.inc:169
@@ -1249,66 +1264,65 @@ msgstr "内容"
 msgid "This object has no relationship to other objects."
 msgstr "这个对象和其他对象没有关系。"
 
-#: plugins/generic/references/class_reference.inc:44
+#: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/class_divListOGroup.inc:269
-#: plugins/admin/ogroups/tabs_ogroups.inc:110
-#: plugins/admin/ogroups/tabs_ogroups.inc:256
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:308
 #: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:274
+#: plugins/admin/users/class_divListUsers.inc:278
 #: plugins/admin/groups/class_divListGroup.inc:263
 msgid "Mail"
 msgstr "邮件"
 
-#: plugins/generic/references/class_reference.inc:50
+#: plugins/generic/references/class_reference.inc:51
 msgid "FAX"
 msgstr "传真"
 
-#: plugins/generic/references/class_reference.inc:52
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/users/class_divListUsers.inc:89
 msgid "Proxy"
 msgstr "代理"
 
-#: plugins/generic/references/class_reference.inc:54
+#: plugins/generic/references/class_reference.inc:55
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/class_ogroupManagement.inc:512
 #: plugins/admin/groups/class_divListGroup.inc:189
 msgid "Group"
 msgstr "组"
 
-#: plugins/generic/references/class_reference.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:500
-#: plugins/admin/ogroups/tabs_ogroups.inc:153
+#: plugins/generic/references/class_reference.inc:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:513
 #: plugins/admin/groups/class_divListGroup.inc:267
 msgid "Application"
 msgstr "应用程序"
 
-#: plugins/generic/references/class_reference.inc:64
-#: plugins/admin/ogroups/class_ogroupManagement.inc:502
-#: setup/setup_config2.tpl:264 setup/setup_config2.tpl:309
+#: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/class_ogroupManagement.inc:515
+#: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
 msgid "Server"
 msgstr "服务器"
 
-#: plugins/generic/references/class_reference.inc:66
+#: plugins/generic/references/class_reference.inc:67
 msgid "Thin Client"
 msgstr "瘦客户机"
 
-#: plugins/generic/references/class_reference.inc:68
-#: plugins/admin/ogroups/class_ogroupManagement.inc:504
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/class_ogroupManagement.inc:517
 msgid "Workstation"
 msgstr "工作站"
 
-#: plugins/generic/references/class_reference.inc:70
+#: plugins/generic/references/class_reference.inc:71
 #: plugins/admin/ogroups/class_divListOGroup.inc:83
 #: plugins/admin/ogroups/class_divListOGroup.inc:206
 #: plugins/admin/ogroups/class_divListOGroup.inc:335
 msgid "Object group"
 msgstr "对象组"
 
-#: plugins/generic/references/class_reference.inc:72
-#: plugins/admin/ogroups/class_ogroupManagement.inc:507
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/class_ogroupManagement.inc:520
 msgid "Printer"
 msgstr "打印机"
 
@@ -1346,7 +1360,7 @@ msgid ""
 "newticket'\ttarget='_blank'>Bugsubmitter</a>"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:43 plugins/admin/departments/main.inc:45
+#: plugins/admin/departments/main.inc:42 plugins/admin/departments/main.inc:44
 msgid "Department management"
 msgstr "部门管理"
 
@@ -1444,6 +1458,17 @@ msgstr "将部门标记为独立的管理单元"
 msgid "List of departments"
 msgstr "部门列表"
 
+#: plugins/admin/departments/class_divListDepartment.inc:61
+#: plugins/admin/acl/class_divListACL.inc:67
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/users/class_divListUsers.inc:74
+#: plugins/admin/groups/class_divListGroup.inc:73 setup/setup_migrate.tpl:65
+#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:173
+#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:346
+#, fuzzy
+msgid "Select all"
+msgstr "选择"
+
 #: plugins/admin/departments/class_divListDepartment.inc:67
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Department name"
@@ -1456,7 +1481,7 @@ msgstr "部门名称"
 #: plugins/admin/ogroups/class_divListOGroup.inc:85
 #: plugins/admin/ogroups/class_divListOGroup.inc:199
 #: plugins/admin/users/class_divListUsers.inc:82
-#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/groups/class_divListGroup.inc:81
 #: plugins/admin/groups/class_divListGroup.inc:181
 msgid "Actions"
@@ -1470,7 +1495,7 @@ msgstr "匹配附件名称的正则表达式"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 msgid "Submit department"
 msgstr "提交部门"
@@ -1478,18 +1503,19 @@ msgstr "提交部门"
 #: plugins/admin/departments/class_divListDepartment.inc:146
 #: plugins/admin/acl/class_divListACL.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:195
-#: plugins/admin/users/class_divListUsers.inc:164
+#: plugins/admin/users/class_divListUsers.inc:163
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Submit"
 msgstr "提交"
 
 #: plugins/admin/departments/class_divListDepartment.inc:151
 #: plugins/admin/acl/class_divListACL.inc:161
 #: plugins/admin/ogroups/class_divListOGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/groups/class_divListGroup.inc:183
-#: setup/class_setupStep_Migrate.inc:900
+#: setup/class_setupStep_Migrate.inc:914
 msgid "Create"
 msgstr "创建"
 
@@ -1497,14 +1523,14 @@ msgstr "创建"
 #: plugins/admin/acl/class_divListACL.inc:242
 #: plugins/admin/acl/class_divListACL.inc:264
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/users/class_divListUsers.inc:330
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "edit"
 msgstr "编辑"
 
 #: plugins/admin/departments/class_divListDepartment.inc:185
 #: plugins/admin/ogroups/class_divListOGroup.inc:294
-#: plugins/admin/groups/class_divListGroup.inc:298
+#: plugins/admin/groups/class_divListGroup.inc:310
 msgid "Edit this entry"
 msgstr "编辑这条记录"
 
@@ -1512,14 +1538,14 @@ msgstr "编辑这条记录"
 #: plugins/admin/acl/class_divListACL.inc:252
 #: plugins/admin/acl/class_divListACL.inc:268
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/users/class_divListUsers.inc:354
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/users/class_divListUsers.inc:369
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "delete"
 msgstr "删除"
 
 #: plugins/admin/departments/class_divListDepartment.inc:190
 #: plugins/admin/ogroups/class_divListOGroup.inc:302
-#: plugins/admin/groups/class_divListGroup.inc:307
+#: plugins/admin/groups/class_divListGroup.inc:319
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
@@ -1529,8 +1555,8 @@ msgstr "部门"
 
 #: plugins/admin/departments/class_divListDepartment.inc:229
 #: plugins/admin/ogroups/class_divListOGroup.inc:352
-#: plugins/admin/users/class_divListUsers.inc:445
-#: plugins/admin/groups/class_divListGroup.inc:365
+#: plugins/admin/users/class_divListUsers.inc:460
+#: plugins/admin/groups/class_divListGroup.inc:380
 #, fuzzy
 msgid "Number of listed departments"
 msgstr "部门名称"
@@ -1556,7 +1582,7 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:152
+#: plugins/admin/departments/class_departmentGeneric.inc:306 html/main.php:153
 #: html/password.php:58
 #, fuzzy
 msgid "Fatal error"
@@ -1585,9 +1611,9 @@ msgid "Moving '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s'"
 
 #: plugins/admin/departments/class_departmentGeneric.inc:492
-#: include/utils/class_msgPool.inc:462 include/class_acl.inc:663
-#: include/class_acl.inc:670 include/class_acl.inc:677
-#: include/class_acl.inc:683 ihtml/themes/default/snapshotdialog.tpl:20
+#: include/utils/class_msgPool.inc:462 include/class_acl.inc:696
+#: include/class_acl.inc:703 include/class_acl.inc:710
+#: include/class_acl.inc:716 ihtml/themes/default/snapshotdialog.tpl:20
 #: ihtml/themes/default/snapshotdialog.tpl:62
 msgid "Object"
 msgstr "对象"
@@ -1631,40 +1657,40 @@ msgstr "从对象 '%s' 删除标记"
 msgid "Manage Departments"
 msgstr "部门"
 
-#: plugins/admin/departments/class_departmentManagement.inc:196
-#: plugins/admin/departments/class_departmentManagement.inc:244
-#: plugins/admin/departments/class_departmentManagement.inc:263
-#: plugins/admin/acl/class_aclManagement.inc:163
-#: plugins/admin/acl/class_aclManagement.inc:200
-#: plugins/admin/acl/class_aclManagement.inc:253
-#: plugins/admin/acl/class_aclManagement.inc:277
+#: plugins/admin/departments/class_departmentManagement.inc:198
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/departments/class_departmentManagement.inc:266
+#: plugins/admin/acl/class_aclManagement.inc:164
+#: plugins/admin/acl/class_aclManagement.inc:201
+#: plugins/admin/acl/class_aclManagement.inc:251
+#: plugins/admin/acl/class_aclManagement.inc:275
 #: plugins/admin/acl/class_aclManagement.inc:316
-#: plugins/admin/acl/class_aclManagement.inc:340
-#: plugins/admin/ogroups/class_ogroupManagement.inc:263
-#: plugins/admin/ogroups/class_ogroupManagement.inc:315
-#: plugins/admin/ogroups/class_ogroupManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/acl/class_aclManagement.inc:352
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
+#: plugins/admin/ogroups/class_ogroupManagement.inc:323
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
 #: plugins/admin/users/class_userManagement.inc:534
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/groups/class_groupManagement.inc:440
-#: plugins/admin/groups/class_groupManagement.inc:471
+#: plugins/admin/users/class_userManagement.inc:538
+#: plugins/admin/groups/class_groupManagement.inc:397
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/groups/class_groupManagement.inc:482
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: plugins/admin/departments/class_departmentManagement.inc:238
+#: plugins/admin/departments/class_departmentManagement.inc:241
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "您将要删除 '%s' 下的整个 LDAP 子树。"
 
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/admin/departments/class_departmentManagement.inc:314
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
 "the page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:331
+#: plugins/admin/departments/class_departmentManagement.inc:334
 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 "
@@ -1672,14 +1698,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/acl/class_aclManagement.inc:26
-#: plugins/admin/acl/class_aclManagement.inc:309
 #: plugins/admin/acl/tabs_acl.inc:28
 #: plugins/admin/acl/class_divListACL.inc:259
 #: plugins/admin/acl/class_aclRole.inc:360
-#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:343
-#: include/class_acl.inc:429 include/class_acl.inc:430
-#: include/class_acl.inc:1114 include/class_acl.inc:1115
-#: include/class_acl.inc:1120
+#: plugins/admin/acl/class_aclRole.inc:361 include/class_tabs.inc:370
+#: include/class_acl.inc:450 include/class_acl.inc:453
+#: include/class_acl.inc:1176 include/class_acl.inc:1177
+#: include/class_acl.inc:1182
 msgid "ACL"
 msgstr "ACL"
 
@@ -1709,7 +1734,6 @@ msgid "List of acls"
 msgstr "宏列表"
 
 #: plugins/admin/acl/class_divListACL.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Summary"
 msgstr "总结"
 
@@ -1720,7 +1744,7 @@ msgstr "显示匹配的宏"
 
 #: plugins/admin/acl/class_divListACL.inc:178
 #: plugins/admin/ogroups/class_divListOGroup.inc:232
-#: plugins/admin/users/class_divListUsers.inc:206
+#: plugins/admin/users/class_divListUsers.inc:207
 #: plugins/admin/groups/class_divListGroup.inc:214
 #, fuzzy
 msgid "Copy"
@@ -1728,7 +1752,7 @@ msgstr "复制"
 
 #: plugins/admin/acl/class_divListACL.inc:180
 #: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_divListUsers.inc:211
 #: plugins/admin/groups/class_divListGroup.inc:216
 #, fuzzy
 msgid "Cut"
@@ -1738,39 +1762,39 @@ msgstr "剪切"
 #: plugins/admin/acl/class_divListACL.inc:187
 #: plugins/admin/ogroups/class_divListOGroup.inc:238
 #: plugins/admin/ogroups/class_divListOGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:212
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_divListUsers.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:220
 #: plugins/admin/groups/class_divListGroup.inc:223
-#: include/class_CopyPasteHandler.inc:484
+#: include/class_CopyPasteHandler.inc:489
 msgid "Paste"
 msgstr "粘贴"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "cut"
 msgstr "剪切"
 
 #: plugins/admin/acl/class_divListACL.inc:235
 #: plugins/admin/ogroups/class_divListOGroup.inc:288
-#: plugins/admin/users/class_divListUsers.inc:309
-#: plugins/admin/groups/class_divListGroup.inc:291
+#: plugins/admin/users/class_divListUsers.inc:312
+#: plugins/admin/groups/class_divListGroup.inc:303
 msgid "Cut this entry"
 msgstr "剪切条目"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "copy"
 msgstr "复制"
 
 #: plugins/admin/acl/class_divListACL.inc:237
 #: plugins/admin/ogroups/class_divListOGroup.inc:290
-#: plugins/admin/users/class_divListUsers.inc:311
-#: plugins/admin/groups/class_divListGroup.inc:293
+#: plugins/admin/users/class_divListUsers.inc:319
+#: plugins/admin/groups/class_divListGroup.inc:305
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
@@ -1806,7 +1830,7 @@ msgstr "访问选项"
 msgid "Edit AC roles"
 msgstr "MAC 地址"
 
-#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:197
+#: plugins/admin/acl/class_aclRole.inc:123 include/class_acl.inc:199
 #, fuzzy
 msgid "All categories"
 msgstr "添加分类"
@@ -1816,47 +1840,48 @@ msgstr "添加分类"
 msgid "Reset ACL"
 msgstr "删除"
 
-#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:206
+#: plugins/admin/acl/class_aclRole.inc:131 include/class_acl.inc:208
 #, fuzzy
 msgid "One level"
 msgstr "日志级别"
 
-#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:207
-#: include/class_acl.inc:212
+#: plugins/admin/acl/class_aclRole.inc:132 include/class_acl.inc:209
+#: include/class_acl.inc:214
 #, fuzzy
 msgid "Current object"
 msgstr "创建新 FAI 对象"
 
-#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:208
+#: plugins/admin/acl/class_aclRole.inc:133 include/class_acl.inc:210
 #, fuzzy
 msgid "Complete subtree"
 msgstr "忽略子树"
 
-#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:209
+#: plugins/admin/acl/class_aclRole.inc:134 include/class_acl.inc:211
 msgid "Complete subtree (permanent)"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:358
 #: include/class_MultiSelectWindow.inc:248
-#: include/class_MultiSelectWindow.inc:250 include/class_acl.inc:427
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:49 include/class_acl.inc:446
 msgid "Up"
 msgstr "上"
 
-#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:428
+#: plugins/admin/acl/class_aclRole.inc:359 include/class_acl.inc:447
 msgid "Down"
 msgstr "关闭"
 
 #: plugins/admin/acl/class_aclRole.inc:360
 #: plugins/admin/acl/class_aclRole.inc:405
-#: plugins/admin/users/class_divListUsers.inc:183
-#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:429
-#: include/class_acl.inc:472
+#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/groups/class_divListGroup.inc:195 include/class_acl.inc:450
+#: include/class_acl.inc:496
 msgid "Edit"
 msgstr "编辑"
 
 #: plugins/admin/acl/class_aclRole.inc:361
 #: plugins/admin/acl/class_aclRole.inc:406 include/utils/class_msgPool.inc:338
-#: include/class_acl.inc:430 include/class_acl.inc:473
+#: include/class_acl.inc:453 include/class_acl.inc:497
 #, php-format
 msgid "Delete"
 msgstr "删除"
@@ -1885,7 +1910,7 @@ msgstr "分类"
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:528
+#: plugins/admin/acl/class_aclRole.inc:432 include/class_acl.inc:553
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1913,29 +1938,30 @@ msgstr ""
 msgid "Choose subtree to place group in"
 msgstr "选择来放置组的子树"
 
-#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:4
+#: plugins/admin/acl/acl_role.tpl:44 ihtml/themes/default/acl.tpl:7
 #, fuzzy
 msgid "New ACL"
 msgstr "新"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:12
 #, fuzzy
 msgid "ACL type"
 msgstr "分类类型"
 
-#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:8
+#: plugins/admin/acl/acl_role.tpl:49 ihtml/themes/default/acl.tpl:14
+#: ihtml/themes/default/acl.tpl:19
 #, fuzzy
 msgid "Select an acl type"
 msgstr "选择一个位置"
 
-#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:55
+#: plugins/admin/acl/acl_role.tpl:54 ihtml/themes/default/acl.tpl:99
 #, fuzzy
 msgid "List of available ACL categories"
 msgstr "可用软件包列表"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/main.inc:37 plugins/admin/ogroups/main.inc:42
-#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
+#: plugins/admin/ogroups/class_ogroup.inc:1048
 msgid "Object groups"
 msgstr "对象组"
 
@@ -1944,31 +1970,31 @@ msgstr "对象组"
 msgid "Manage object groups"
 msgstr "对象组名称"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:209
-#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/ogroups/class_ogroupManagement.inc:175
+#: plugins/admin/users/class_userManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:198
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP 错误"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:234
-#: plugins/admin/ogroups/class_ogroupManagement.inc:308
+#: plugins/admin/ogroups/class_ogroupManagement.inc:241
+#: plugins/admin/ogroups/class_ogroupManagement.inc:316
 #, fuzzy
 msgid "object group"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:498
-#: plugins/admin/users/class_divListUsers.inc:175 setup/setup_config2.tpl:273
-#: setup/setup_config2.tpl:318
+#: plugins/admin/ogroups/class_ogroupManagement.inc:511
+#: plugins/admin/users/class_divListUsers.inc:174 setup/setup_config2.tpl:286
+#: setup/setup_config2.tpl:331
 msgid "User"
 msgstr "用户"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:505
+#: plugins/admin/ogroups/class_ogroupManagement.inc:518
 #, fuzzy
 msgid "Windows Install"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:506
+#: plugins/admin/ogroups/class_ogroupManagement.inc:519
 msgid "Terminal"
 msgstr "终端"
 
@@ -1998,7 +2024,7 @@ msgstr "组名称"
 msgid "Descriptive text for this group"
 msgstr "组的描述文字"
 
-#: plugins/admin/ogroups/generic.tpl:42
+#: plugins/admin/ogroups/generic.tpl:70
 msgid "Member objects"
 msgstr "成员对象"
 
@@ -2008,15 +2034,15 @@ msgid "List of object groups"
 msgstr "对象组列表"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:302
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:330
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:417
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:449
 #: plugins/admin/users/class_divListUsers.inc:84
 #: plugins/admin/users/class_divListUsers.inc:85
 #: plugins/admin/users/class_divListUsers.inc:86
@@ -2098,8 +2124,7 @@ msgstr "显示组"
 msgid "Number of listed object groups"
 msgstr "对象组名称"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
-#: plugins/admin/users/class_userManagement.inc:701 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:192 setup/setup_ldap.tpl:121
 #: ihtml/themes/default/MultiSelectWindow.tpl:45
 #: ihtml/themes/default/MultiSelectWindow.tpl:86
 #: ihtml/themes/default/msg_dialog.tpl:59
@@ -2107,125 +2132,134 @@ msgstr "对象组名称"
 msgid "Information"
 msgstr "提示信息"
 
-#: plugins/admin/ogroups/class_ogroup.inc:169
+#: plugins/admin/ogroups/class_ogroup.inc:192
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
-#: plugins/admin/ogroups/class_ogroup.inc:298
-#: plugins/admin/ogroups/class_ogroup.inc:350
+#: plugins/admin/ogroups/class_ogroup.inc:411
+#: plugins/admin/ogroups/class_ogroup.inc:413
+#: plugins/admin/ogroups/class_ogroup.inc:471
 msgid "departments"
 msgstr "部门"
 
-#: plugins/admin/ogroups/class_ogroup.inc:300
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:415
+#: plugins/admin/ogroups/class_ogroup.inc:417
 #, fuzzy
 msgid "people"
 msgstr "显示人员"
 
-#: plugins/admin/ogroups/class_ogroup.inc:304
-#: plugins/admin/ogroups/class_ogroup.inc:306
-#: plugins/admin/ogroups/class_ogroup.inc:348
+#: plugins/admin/ogroups/class_ogroup.inc:419
+#: plugins/admin/ogroups/class_ogroup.inc:421
+#: plugins/admin/ogroups/class_ogroup.inc:469
 msgid "groups"
 msgstr "组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:308
-#: plugins/admin/ogroups/class_ogroup.inc:310
-#: plugins/admin/ogroups/class_ogroup.inc:349
-msgid "applications"
-msgstr "应用程序"
-
-#: plugins/admin/ogroups/class_ogroup.inc:312
-#: plugins/admin/ogroups/class_ogroup.inc:314
-#: plugins/admin/ogroups/class_ogroup.inc:351
+#: plugins/admin/ogroups/class_ogroup.inc:423
+#: plugins/admin/ogroups/class_ogroup.inc:425
+#: plugins/admin/ogroups/class_ogroup.inc:472
 msgid "servers"
 msgstr "服务器"
 
-#: plugins/admin/ogroups/class_ogroup.inc:316
-#: plugins/admin/ogroups/class_ogroup.inc:318
-#: plugins/admin/ogroups/class_ogroup.inc:352
+#: plugins/admin/ogroups/class_ogroup.inc:427
+#: plugins/admin/ogroups/class_ogroup.inc:429
+#: plugins/admin/ogroups/class_ogroup.inc:473
 msgid "workstations"
 msgstr "工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:320
-#: plugins/admin/ogroups/class_ogroup.inc:322
-#: plugins/admin/ogroups/class_ogroup.inc:354
+#: plugins/admin/ogroups/class_ogroup.inc:431
+#: plugins/admin/ogroups/class_ogroup.inc:433
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "terminals"
 msgstr "终端"
 
-#: plugins/admin/ogroups/class_ogroup.inc:324
+#: plugins/admin/ogroups/class_ogroup.inc:435
 #, fuzzy
 msgid "printer"
 msgstr "打印机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:326
-#: plugins/admin/ogroups/class_ogroup.inc:356
+#: plugins/admin/ogroups/class_ogroup.inc:437
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "printers"
 msgstr "打印机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:328
-#: plugins/admin/ogroups/class_ogroup.inc:330
-#: plugins/admin/ogroups/class_ogroup.inc:355
+#: plugins/admin/ogroups/class_ogroup.inc:439
+#: plugins/admin/ogroups/class_ogroup.inc:441
+#: plugins/admin/ogroups/class_ogroup.inc:476
 msgid "phones"
 msgstr "电话"
 
-#: plugins/admin/ogroups/class_ogroup.inc:343
-#: plugins/admin/users/class_userManagement.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:449
+#: plugins/admin/ogroups/class_ogroup.inc:470
+msgid "applications"
+msgstr "应用程序"
+
+#: plugins/admin/ogroups/class_ogroup.inc:464
+#: plugins/admin/users/class_userManagement.inc:481
 msgid "none"
 msgstr "无"
 
-#: plugins/admin/ogroups/class_ogroup.inc:345
+#: plugins/admin/ogroups/class_ogroup.inc:466
 msgid "too many different objects!"
 msgstr "太多不同对象！"
 
-#: plugins/admin/ogroups/class_ogroup.inc:347
+#: plugins/admin/ogroups/class_ogroup.inc:468
 msgid "users"
 msgstr "用户"
 
-#: plugins/admin/ogroups/class_ogroup.inc:353
+#: plugins/admin/ogroups/class_ogroup.inc:474
 #, fuzzy
 msgid "winstations"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:701
 msgid "Non existing dn:"
 msgstr "不存在的 dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:867
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "您最多只能组合两个不同的对象类！"
 
-#: plugins/admin/ogroups/class_ogroup.inc:808
+#: plugins/admin/ogroups/class_ogroup.inc:1043
 #, fuzzy
 msgid "Object group generic"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:819
+#: plugins/admin/ogroups/class_ogroup.inc:1054
 #, fuzzy
 msgid "Member"
 msgstr "成员"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
-#: plugins/admin/ogroups/tabs_ogroups.inc:248
+#: plugins/admin/ogroups/tabs_ogroups.inc:112
+#: plugins/admin/ogroups/tabs_ogroups.inc:298
 msgid "Phone queue"
 msgstr "电话队列"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:120
-msgid "System"
+#: plugins/admin/ogroups/tabs_ogroups.inc:140
+#, fuzzy
+msgid "Systems"
 msgstr "系统"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:128
-#: plugins/admin/ogroups/tabs_ogroups.inc:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:228
+#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:167
+#: plugins/admin/ogroups/tabs_ogroups.inc:275
 msgid "Devices"
 msgstr "设备"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:159
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:224
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+msgid "FAI summary"
+msgstr "自动化安装说明"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:204
+msgid "Applications"
+msgstr "应用程序"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:269
 msgid "Terminals"
 msgstr "终端"
 
@@ -2259,48 +2293,37 @@ msgstr "匹配对象名的正则表达式"
 msgid "Manage users"
 msgstr "域用户"
 
-#: plugins/admin/users/class_userManagement.inc:309
-#: plugins/admin/users/class_userManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:315
+#: plugins/admin/users/class_userManagement.inc:368
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "您无权修改您的口令。"
 
-#: plugins/admin/users/class_userManagement.inc:530
+#: plugins/admin/users/class_userManagement.inc:534
 #, fuzzy, php-format
 msgid "You have no permission to modify object '%s'!"
 msgstr "您无权删除这个黑名单。"
 
-#: plugins/admin/users/class_userManagement.inc:534
+#: plugins/admin/users/class_userManagement.inc:538
 #, fuzzy
 msgid "You have no permission to use this template!"
 msgstr "您无权删除这个黑名单。"
 
-#: plugins/admin/users/class_userManagement.inc:563
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:331
+#: plugins/admin/users/class_userManagement.inc:577
+#: plugins/admin/users/class_divListUsers.inc:341
 #, fuzzy
 msgid "user"
 msgstr "用户"
 
-#: plugins/admin/users/class_userManagement.inc:564
+#: plugins/admin/users/class_userManagement.inc:633
 #, fuzzy
-msgid "Delete users"
-msgstr "删除用户"
-
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/users/class_divListUsers.inc:355
-msgid "Delete user"
-msgstr "删除用户"
-
-#: plugins/admin/users/class_userManagement.inc:701
-#, fuzzy
-msgid "User successfully removed."
-msgstr "导入成功"
+msgid "You have no permission to change the lock status for this user!"
+msgstr "您无权修改您的口令。"
 
-#: plugins/admin/users/class_userManagement.inc:792
+#: plugins/admin/users/class_userManagement.inc:749
 #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
 #: plugins/admin/users/class_divListUsers.inc:84
-#: plugins/admin/users/class_divListUsers.inc:177
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Template"
 msgstr "模板"
 
@@ -2333,7 +2356,7 @@ msgstr ""
 msgid "No templates available!"
 msgstr "文件可用。"
 
-#: plugins/admin/users/main.inc:45 plugins/admin/users/main.inc:51
+#: plugins/admin/users/main.inc:44 plugins/admin/users/main.inc:50
 msgid "User administration"
 msgstr "用户管理"
 
@@ -2373,7 +2396,7 @@ msgid "functional users"
 msgstr "显示用户"
 
 #: plugins/admin/users/class_divListUsers.inc:86
-#: plugins/admin/users/class_divListUsers.inc:270
+#: plugins/admin/users/class_divListUsers.inc:274
 #: plugins/admin/groups/class_divListGroup.inc:261
 msgid "Posix"
 msgstr "Posix"
@@ -2403,81 +2426,85 @@ msgstr "显示代理用户"
 msgid "Display users matching"
 msgstr "显示匹配的用户"
 
-#: plugins/admin/users/class_divListUsers.inc:185
-#: plugins/admin/users/class_divListUsers.inc:341
+#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:353
 #: ihtml/themes/default/accountexpired.tpl:51
 msgid "Change password"
 msgstr "修改口令"
 
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/users/class_divListUsers.inc:188
 #, fuzzy
 msgid "Apply template"
 msgstr "模板"
 
-#: plugins/admin/users/class_divListUsers.inc:268
+#: plugins/admin/users/class_divListUsers.inc:272
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_divListUsers.inc:269
+#: plugins/admin/users/class_divListUsers.inc:273
 msgid "Edit generic properties"
 msgstr "编辑通用属性"
 
-#: plugins/admin/users/class_divListUsers.inc:271
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Edit UNIX properties"
 msgstr "编辑 UNIX 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:273
+#: plugins/admin/users/class_divListUsers.inc:277
 msgid "Edit environment properties"
 msgstr "编辑环境属性"
 
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/class_divListUsers.inc:279
 msgid "Edit mail properties"
 msgstr "编辑邮件属性"
 
-#: plugins/admin/users/class_divListUsers.inc:277
+#: plugins/admin/users/class_divListUsers.inc:281
 msgid "Edit phone properties"
 msgstr "编辑电话属性"
 
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:283
 msgid "Edit fax properies"
 msgstr "编辑传真属性"
 
-#: plugins/admin/users/class_divListUsers.inc:281
+#: plugins/admin/users/class_divListUsers.inc:285
 msgid "Edit samba properties"
 msgstr "编辑 samba 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:282
+#: plugins/admin/users/class_divListUsers.inc:286
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:283
+#: plugins/admin/users/class_divListUsers.inc:287
 msgid "Edit netatalk properties"
 msgstr "编辑 netatalk 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:284
+#: plugins/admin/users/class_divListUsers.inc:288
 msgid "Create user from template"
 msgstr "从模板创建用户"
 
-#: plugins/admin/users/class_divListUsers.inc:285
+#: plugins/admin/users/class_divListUsers.inc:289
 msgid "Create user with this template"
 msgstr "创建使用该模板的用户"
 
-#: plugins/admin/users/class_divListUsers.inc:320
+#: plugins/admin/users/class_divListUsers.inc:330
 #, fuzzy
 msgid "inactive"
 msgstr "活动"
 
-#: plugins/admin/users/class_divListUsers.inc:340
+#: plugins/admin/users/class_divListUsers.inc:352
 msgid "password"
 msgstr "口令"
 
-#: plugins/admin/users/class_divListUsers.inc:344
-#: plugins/admin/users/class_divListUsers.inc:358
+#: plugins/admin/users/class_divListUsers.inc:356
+#: plugins/admin/users/class_divListUsers.inc:373
 #, fuzzy
 msgid "Not allowed"
 msgstr "不允许修改口令"
 
-#: plugins/admin/users/class_divListUsers.inc:444
+#: plugins/admin/users/class_divListUsers.inc:370
+msgid "Delete user"
+msgstr "删除用户"
+
+#: plugins/admin/users/class_divListUsers.inc:459
 #, fuzzy
 msgid "Number of listed users"
 msgstr "部门名称"
@@ -2494,7 +2521,7 @@ msgstr "用下面的字段修改用口令。修改即时生效。请记住新密
 msgid "Strength"
 msgstr "街道"
 
-#: plugins/admin/groups/main.inc:42 plugins/admin/groups/main.inc:46
+#: plugins/admin/groups/main.inc:41 plugins/admin/groups/main.inc:45
 msgid "Group administration"
 msgstr "组管理"
 
@@ -2568,18 +2595,18 @@ msgstr "组成员"
 
 #: plugins/admin/groups/class_groupGeneric.inc:162
 #: plugins/admin/groups/class_groupGeneric.inc:690
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #: include/class_CopyPasteHandler.inc:119
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:176
 #: include/class_CopyPasteHandler.inc:184
 #: include/class_CopyPasteHandler.inc:193 include/utils/class_timezone.inc:51
-#: include/class_config.inc:109 include/class_config.inc:561
+#: include/class_config.inc:110 include/class_config.inc:574
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/password-methods/class_password-methods-ssha.inc:51
-#: include/class_pluglist.inc:149 include/functions.inc:604
-#: include/functions.inc:2528 include/functions.inc:2559 html/main.php:217
-#: html/index.php:141 html/index.php:217 html/password.php:78
+#: include/class_pluglist.inc:151 include/functions.inc:605
+#: include/functions.inc:2545 include/functions.inc:2577 html/main.php:218
+#: html/index.php:142 html/index.php:218 html/password.php:78
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -2635,7 +2662,7 @@ msgid "Generic group settings"
 msgstr "组设置"
 
 #: plugins/admin/groups/class_groupGeneric.inc:1208
-#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:216
+#: plugins/admin/groups/class_groupManagement.inc:26 include/class_acl.inc:218
 msgid "Groups"
 msgstr "用户组"
 
@@ -2673,8 +2700,8 @@ msgstr "Samba"
 msgid "Manage POSIX groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:354
-#: plugins/admin/groups/class_groupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/groups/class_groupManagement.inc:444
 #, fuzzy
 msgid "group"
 msgstr "组"
@@ -2727,7 +2754,7 @@ msgstr "选择查看实用的普通组"
 msgid "functional groups"
 msgstr "显示实用组"
 
-#: plugins/admin/groups/class_divListGroup.inc:364
+#: plugins/admin/groups/class_divListGroup.inc:379
 #, fuzzy
 msgid "Number of listed groups"
 msgstr "组名称"
@@ -2736,25 +2763,25 @@ msgstr "组名称"
 msgid "Group settings"
 msgstr "组设置"
 
-#: setup/class_setupStep_Config2.inc:85 setup/class_setupStep_Config2.inc:86
+#: setup/class_setupStep_Config2.inc:86 setup/class_setupStep_Config2.inc:87
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "用户设置"
 
-#: setup/class_setupStep_Config2.inc:87
+#: setup/class_setupStep_Config2.inc:88
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "检查参数"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:55
 #: setup/setup_feedback.tpl:73
 msgid "No"
 msgstr "否"
 
-#: setup/class_setupStep_Config2.inc:162 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Schema.inc:84 setup/class_setupStep_Ldap.inc:74
+#: setup/class_setupStep_Config2.inc:167 setup/class_setupStep_Config1.inc:88
+#: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Ldap.inc:74
 #: setup/class_setupStep_Config3.inc:89 setup/setup_feedback.tpl:53
 #: setup/setup_feedback.tpl:71
 msgid "Yes"
@@ -2838,9 +2865,9 @@ msgstr "查找"
 #: setup/setup_ldap.tpl:16 setup/setup_migrate.tpl:133
 #: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:250
 #: setup/setup_migrate.tpl:305 setup/setup_migrate.tpl:358
-#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:8
-#: ihtml/themes/default/acl.tpl:20 ihtml/themes/default/acl.tpl:75
-#: ihtml/themes/default/acl.tpl:89
+#: include/utils/class_msgPool.inc:320 ihtml/themes/default/acl.tpl:24
+#: ihtml/themes/default/acl.tpl:47 ihtml/themes/default/acl.tpl:120
+#: ihtml/themes/default/acl.tpl:135
 #, php-format
 msgid "Apply"
 msgstr "应用"
@@ -2848,15 +2875,14 @@ msgstr "应用"
 #: setup/setup_ldap.tpl:17 setup/setup_migrate.tpl:135
 #: setup/setup_migrate.tpl:186 setup/setup_migrate.tpl:251
 #: setup/setup_migrate.tpl:307 setup/setup_migrate.tpl:360
-#: include/utils/class_msgPool.inc:308 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/acl.tpl:77 ihtml/themes/default/acl.tpl:91
-#: ihtml/themes/default/remove.tpl:15
+#: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
+#: ihtml/themes/default/islocked.tpl:15 ihtml/themes/default/acl.tpl:123
+#: ihtml/themes/default/acl.tpl:137 ihtml/themes/default/remove.tpl:15
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/copyPasteDialog.tpl:21
 #: ihtml/themes/default/msg_dialog.tpl:79
 #: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/pwd_heimdal.tpl:200
 #, php-format
 msgid "Cancel"
 msgstr "取消"
@@ -3219,36 +3245,51 @@ msgstr "管理 netatalk 账号"
 msgid "Government mode"
 msgstr "部门名称"
 
-#: setup/setup_config2.tpl:180
+#: setup/setup_config2.tpl:182
+#, fuzzy
+msgid "Logging options"
+msgstr "未知"
+
+#: setup/setup_config2.tpl:186
+#, fuzzy
+msgid "Syslog"
+msgstr "系统日志"
+
+#: setup/setup_config2.tpl:188 setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "LDAP 错误:"
+
+#: setup/setup_config2.tpl:193
 msgid "Mail settings"
 msgstr "邮件选项"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:197
 msgid "Mail method"
 msgstr "邮件方法"
 
-#: setup/setup_config2.tpl:200
+#: setup/setup_config2.tpl:213
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:214
+#: setup/setup_config2.tpl:227
 #, fuzzy
 msgid "Vacation templates"
 msgstr "工作站模板"
 
-#: setup/setup_config2.tpl:230
+#: setup/setup_config2.tpl:243
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:240
+#: setup/setup_config2.tpl:253
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:249 setup/setup_config2.tpl:294
+#: setup/setup_config2.tpl:262 setup/setup_config2.tpl:307
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:255 setup/setup_config2.tpl:300
+#: setup/setup_config2.tpl:268 setup/setup_config2.tpl:313
 msgid "Snapshot base"
 msgstr ""
 
@@ -3377,13 +3418,6 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:121
-#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:293
-#: setup/setup_migrate.tpl:346
-#, fuzzy
-msgid "Select all"
-msgstr "选择"
-
 #: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
@@ -3511,25 +3545,25 @@ msgid ""
 "'Migrate' button below."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
+#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
 #, fuzzy
 msgid "LDAP inspection"
 msgstr "PHP 安装检查"
 
-#: setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:108
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:113
+#: setup/class_setupStep_Migrate.inc:114
 #, fuzzy
 msgid "Checking for root object"
 msgstr "检查 iconv 支持"
 
-#: setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:120
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:125
+#: setup/class_setupStep_Migrate.inc:126
 #, fuzzy
 msgid "Checking for invisible departments"
 msgstr "检查 iconv 支持"
@@ -3554,48 +3588,48 @@ msgstr "检查 cups 模块"
 msgid "Checking for groups outside the groups tree"
 msgstr "检查 cups 模块"
 
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:156
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:162
 #, fuzzy
 msgid "Checking for duplicated UID numbers"
 msgstr "检查函数 %s"
 
-#: setup/class_setupStep_Migrate.inc:167
+#: setup/class_setupStep_Migrate.inc:168
 #, fuzzy
 msgid "Checking for duplicate GID numbers"
 msgstr "检查函数 %s"
 
-#: setup/class_setupStep_Migrate.inc:193 setup/class_setupStep_Migrate.inc:245
-#: setup/class_setupStep_Migrate.inc:310 setup/class_setupStep_Migrate.inc:374
-#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
-#: setup/class_setupStep_Migrate.inc:605 setup/class_setupStep_Migrate.inc:735
-#: setup/class_setupStep_Migrate.inc:824
+#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
+#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:608 setup/class_setupStep_Migrate.inc:749
+#: setup/class_setupStep_Migrate.inc:838
 #, fuzzy
 msgid "LDAP query failed"
 msgstr "Mysql 查询失败。"
 
-#: setup/class_setupStep_Migrate.inc:194 setup/class_setupStep_Migrate.inc:246
-#: setup/class_setupStep_Migrate.inc:311 setup/class_setupStep_Migrate.inc:375
-#: setup/class_setupStep_Migrate.inc:444 setup/class_setupStep_Migrate.inc:521
-#: setup/class_setupStep_Migrate.inc:606 setup/class_setupStep_Migrate.inc:736
-#: setup/class_setupStep_Migrate.inc:825
+#: setup/class_setupStep_Migrate.inc:195 setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:312 setup/class_setupStep_Migrate.inc:376
+#: setup/class_setupStep_Migrate.inc:447 setup/class_setupStep_Migrate.inc:524
+#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:750
+#: setup/class_setupStep_Migrate.inc:839
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:216
+#: setup/class_setupStep_Migrate.inc:217
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "发现记录类型 '%s' 有重复。"
 
-#: setup/class_setupStep_Migrate.inc:220 setup/class_setupStep_Migrate.inc:272
-#: setup/class_setupStep_Migrate.inc:333 setup/class_setupStep_Migrate.inc:404
-#: setup/class_setupStep_Migrate.inc:481 setup/class_setupStep_Migrate.inc:556
-#: setup/class_setupStep_Migrate.inc:609 setup/class_setupStep_Migrate.inc:739
-#: setup/class_setupStep_Migrate.inc:894
-#: setup/class_setupStep_Migrate.inc:1657 setup/setup_checks.tpl:27
+#: setup/class_setupStep_Migrate.inc:221 setup/class_setupStep_Migrate.inc:273
+#: setup/class_setupStep_Migrate.inc:334 setup/class_setupStep_Migrate.inc:407
+#: setup/class_setupStep_Migrate.inc:484 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:612 setup/class_setupStep_Migrate.inc:753
+#: setup/class_setupStep_Migrate.inc:908
+#: setup/class_setupStep_Migrate.inc:1673 setup/setup_checks.tpl:27
 #: setup/setup_checks.tpl:87 include/utils/class_msgPool.inc:314
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
@@ -3605,156 +3639,156 @@ msgstr "发现记录类型 '%s' 有重复。"
 msgid "Ok"
 msgstr "好"
 
-#: setup/class_setupStep_Migrate.inc:268
+#: setup/class_setupStep_Migrate.inc:269
 #, fuzzy, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "发现记录类型 '%s' 有重复。"
 
-#: setup/class_setupStep_Migrate.inc:326 setup/class_setupStep_Migrate.inc:535
-#: setup/class_setupStep_Migrate.inc:548 setup/class_setupStep_Migrate.inc:898
-#: setup/class_setupStep_Migrate.inc:1634
-#: setup/class_setupStep_Migrate.inc:1647
+#: setup/class_setupStep_Migrate.inc:327 setup/class_setupStep_Migrate.inc:538
+#: setup/class_setupStep_Migrate.inc:551 setup/class_setupStep_Migrate.inc:912
+#: setup/class_setupStep_Migrate.inc:1650
+#: setup/class_setupStep_Migrate.inc:1663
 msgid "Failed"
 msgstr "失败"
 
-#: setup/class_setupStep_Migrate.inc:328
+#: setup/class_setupStep_Migrate.inc:329
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:329 setup/class_setupStep_Migrate.inc:616
-#: setup/class_setupStep_Migrate.inc:745
+#: setup/class_setupStep_Migrate.inc:330 setup/class_setupStep_Migrate.inc:619
+#: setup/class_setupStep_Migrate.inc:759
 #, fuzzy
 msgid "Migrate"
 msgstr "创建"
 
-#: setup/class_setupStep_Migrate.inc:399
+#: setup/class_setupStep_Migrate.inc:402
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:400 setup/class_setupStep_Migrate.inc:477
+#: setup/class_setupStep_Migrate.inc:403 setup/class_setupStep_Migrate.inc:480
 #, fuzzy
 msgid "Move"
 msgstr "模式"
 
-#: setup/class_setupStep_Migrate.inc:476
+#: setup/class_setupStep_Migrate.inc:479
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:550
+#: setup/class_setupStep_Migrate.inc:540 setup/class_setupStep_Migrate.inc:553
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:614
+#: setup/class_setupStep_Migrate.inc:617
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
+#: setup/class_setupStep_Migrate.inc:979
 #, fuzzy
 msgid "Migration error"
 msgstr "创建"
 
-#: setup/class_setupStep_Migrate.inc:664 setup/class_setupStep_Migrate.inc:796
+#: setup/class_setupStep_Migrate.inc:667 setup/class_setupStep_Migrate.inc:810
 #, fuzzy, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "转到根部门"
 
-#: setup/class_setupStep_Migrate.inc:744
+#: setup/class_setupStep_Migrate.inc:758
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:899
+#: setup/class_setupStep_Migrate.inc:913
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:965
+#: setup/class_setupStep_Migrate.inc:979
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Password error"
 msgstr "口令过期截止日"
 
-#: setup/class_setupStep_Migrate.inc:990
+#: setup/class_setupStep_Migrate.inc:1004
 #, fuzzy
 msgid "Provided passwords do not match!"
 msgstr "输入的新口令和重复口令不匹配！"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Input error"
 msgstr "PHP 错误"
 
-#: setup/class_setupStep_Migrate.inc:995
+#: setup/class_setupStep_Migrate.inc:1009
 #, fuzzy
 msgid "Specify a valid user ID!"
 msgstr "请输入一个有效的用户名！"
 
-#: setup/class_setupStep_Migrate.inc:1037
+#: setup/class_setupStep_Migrate.inc:1051
 #, fuzzy, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr "为对象 '%s' 设置动作状态(FAIstate) 失败，值为 '%s'。"
 
-#: setup/class_setupStep_Migrate.inc:1076
-#: setup/class_setupStep_Migrate.inc:1125
-#: setup/class_setupStep_Migrate.inc:1174
+#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1188
 #, fuzzy
 msgid "Cannot move users to the requested department!"
 msgstr "选择放置部门的子树"
 
-#: setup/class_setupStep_Migrate.inc:1086
+#: setup/class_setupStep_Migrate.inc:1100
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1086
-#: setup/class_setupStep_Migrate.inc:1136
-#: setup/class_setupStep_Migrate.inc:1184 include/class_plugin.inc:1644
+#: setup/class_setupStep_Migrate.inc:1100
+#: setup/class_setupStep_Migrate.inc:1150
+#: setup/class_setupStep_Migrate.inc:1198 include/class_plugin.inc:1768
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: setup/class_setupStep_Migrate.inc:1097
-#: setup/class_setupStep_Migrate.inc:1146
+#: setup/class_setupStep_Migrate.inc:1111
+#: setup/class_setupStep_Migrate.inc:1160
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1150
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1184
+#: setup/class_setupStep_Migrate.inc:1198
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1194
+#: setup/class_setupStep_Migrate.inc:1208
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1635
+#: setup/class_setupStep_Migrate.inc:1651
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1636
-#: setup/class_setupStep_Migrate.inc:1649
+#: setup/class_setupStep_Migrate.inc:1652
+#: setup/class_setupStep_Migrate.inc:1665
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1648
+#: setup/class_setupStep_Migrate.inc:1664
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1939
+#: setup/class_setupStep_Migrate.inc:1955
 #, fuzzy, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "移动 '%s' 到 '%s'"
@@ -3899,11 +3933,6 @@ msgstr "Samba 设置"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
-#: setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "LDAP 错误:"
-
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -4210,7 +4239,7 @@ msgstr ""
 "GOsa 通过模组支持几种邮件方法。这些方法提供用户邮箱的界面以及管理用户空间。您"
 "可以选择选择 dummy 插件以保持您的邮件设置不被更改。"
 
-#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:133
+#: setup/class_setup.inc:77 setup/class_setupStep_Feedback.inc:132
 #, fuzzy
 msgid "Setup error"
 msgstr "PHP 错误"
@@ -4220,78 +4249,78 @@ msgstr "PHP 错误"
 msgid "Completed"
 msgstr "不完整"
 
-#: setup/class_setupStep_Feedback.inc:93
+#: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:95
+#: setup/class_setupStep_Feedback.inc:94
 #, fuzzy
 msgid "Samba management"
 msgstr "系统管理"
 
-#: setup/class_setupStep_Feedback.inc:97
+#: setup/class_setupStep_Feedback.inc:96
 #, fuzzy
 msgid "Mailsystem management"
 msgstr "系统管理"
 
-#: setup/class_setupStep_Feedback.inc:99
+#: setup/class_setupStep_Feedback.inc:98
 #, fuzzy
 msgid "FAX system administration"
 msgstr "用户管理"
 
-#: setup/class_setupStep_Feedback.inc:101
+#: setup/class_setupStep_Feedback.inc:100
 #, fuzzy
 msgid "Asterisk administration"
 msgstr "用户管理"
 
-#: setup/class_setupStep_Feedback.inc:103
+#: setup/class_setupStep_Feedback.inc:102
 #, fuzzy
 msgid "System inventory"
 msgstr "删除 inventory"
 
-#: setup/class_setupStep_Feedback.inc:105
+#: setup/class_setupStep_Feedback.inc:104
 #, fuzzy
 msgid "System-/Configmanagement"
 msgstr "系统管理"
 
-#: setup/class_setupStep_Feedback.inc:107
+#: setup/class_setupStep_Feedback.inc:106
 msgid "Addressbook"
 msgstr "地址簿"
 
-#: setup/class_setupStep_Feedback.inc:113
-#: setup/class_setupStep_Feedback.inc:115
+#: setup/class_setupStep_Feedback.inc:112
+#: setup/class_setupStep_Feedback.inc:114
 msgid "Notification and feedback"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:114
+#: setup/class_setupStep_Feedback.inc:113
 #, fuzzy
 msgid "Get notifications or send feedback"
 msgstr "主机通知命令"
 
-#: setup/class_setupStep_Feedback.inc:142
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:141
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Feedback error"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:142
+#: setup/class_setupStep_Feedback.inc:141
 #, php-format
 msgid "Cannot send feedback to '%s': %s"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:149
+#: setup/class_setupStep_Feedback.inc:148
 msgid "Cannot send feedback: service temporarily unavailable"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:151
+#: setup/class_setupStep_Feedback.inc:150
 msgid "Feedback sucessfully send"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:181
+#: setup/class_setupStep_Feedback.inc:180
 #, fuzzy
 msgid "Please specify a valid email address."
 msgstr "请输入一个有效的 iSerial。"
 
-#: setup/class_setupStep_Feedback.inc:185
+#: setup/class_setupStep_Feedback.inc:184
 msgid ""
 "You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
@@ -4407,18 +4436,18 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1188 include/class_plugin.inc:1200
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1323
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1643
+#: include/class_plugin.inc:1767
 msgid "from"
 msgstr "从"
 
@@ -4445,12 +4474,12 @@ msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
 #: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:591
-#: include/class_ldap.inc:639 include/class_log.inc:88
-#: include/functions.inc:449 include/functions.inc:594
-#: include/functions.inc:680 include/functions.inc:1067
-#: include/functions.inc:1880 include/functions.inc:1914
-#: include/functions.inc:1934 include/class_acl.inc:826
+#: include/class_CopyPasteHandler.inc:269 include/class_ldap.inc:636
+#: include/class_ldap.inc:684 include/class_log.inc:88
+#: include/functions.inc:450 include/functions.inc:595
+#: include/functions.inc:681 include/functions.inc:1068
+#: include/functions.inc:1885 include/functions.inc:1919
+#: include/functions.inc:1939 include/class_acl.inc:879
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
@@ -4465,12 +4494,12 @@ msgstr "无法创建文件 '%s'。"
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:392
+#: include/class_CopyPasteHandler.inc:393
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:486
+#: include/class_CopyPasteHandler.inc:491
 #, fuzzy
 msgid "Cannot paste"
 msgstr "无法粘贴"
@@ -4745,7 +4774,6 @@ msgstr "删除打印机扩展"
 
 #: include/utils/class_msgPool.inc:326 include/class_MultiSelectWindow.inc:134
 #: ihtml/themes/default/copyPasteDialog.tpl:19
-#: ihtml/themes/default/pwd_heimdal.tpl:198
 #, php-format
 msgid "Save"
 msgstr "保存"
@@ -4981,47 +5009,52 @@ msgstr ""
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:496
+#: include/utils/class_msgPool.inc:497
+#, fuzzy, php-format
+msgid "This '%s' is still in use."
+msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
+
+#: include/utils/class_msgPool.inc:499
 #, fuzzy, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 
-#: include/utils/class_msgPool.inc:502
+#: include/utils/class_msgPool.inc:505
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:508
+#: include/utils/class_msgPool.inc:511
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:514
+#: include/utils/class_msgPool.inc:517
 #, fuzzy, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:520
+#: include/utils/class_msgPool.inc:523
 #, fuzzy, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:526
+#: include/utils/class_msgPool.inc:529
 #, fuzzy, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "转到根部门"
 
-#: include/utils/class_msgPool.inc:532
+#: include/utils/class_msgPool.inc:535
 #, fuzzy, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "无法打开文件 '%s'。"
 
-#: include/utils/class_msgPool.inc:538
+#: include/utils/class_msgPool.inc:541
 #, fuzzy, php-format
 msgid "Checking for %s support"
 msgstr "检查 iconv 支持"
 
-#: include/utils/class_msgPool.inc:544
+#: include/utils/class_msgPool.inc:547
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
@@ -5039,44 +5072,50 @@ msgid "Please fix the above error and reload the page."
 msgstr "请看一下 GOsa 日志文件。"
 
 #: include/class_MultiSelectWindow.inc:240
+#: include/class_baseSelectDialog.inc:47
 msgid "Go to root department"
 msgstr "转到根部门"
 
 #: include/class_MultiSelectWindow.inc:240
 #: include/class_MultiSelectWindow.inc:242
+#: include/class_baseSelectDialog.inc:47
 msgid "Root"
 msgstr "根"
 
 #: include/class_MultiSelectWindow.inc:248
+#: include/class_baseSelectDialog.inc:49
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
 #: include/class_MultiSelectWindow.inc:256
+#: include/class_baseSelectDialog.inc:51
 msgid "Go to users department"
 msgstr "转到用户部门"
 
 #: include/class_MultiSelectWindow.inc:256
 #: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:51
 msgid "Home"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:263
+#: include/class_baseSelectDialog.inc:52
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:530
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:648
-#: include/class_MultiSelectWindow.inc:652
-#: include/class_MultiSelectWindow.inc:656
+#: include/class_MultiSelectWindow.inc:649
+#: include/class_MultiSelectWindow.inc:653
+#: include/class_MultiSelectWindow.inc:657
 #, fuzzy
 msgid "Restore"
 msgstr "仓库"
 
-#: include/class_MultiSelectWindow.inc:651
+#: include/class_MultiSelectWindow.inc:652
 msgid "Restore snapshopts of already deleted objects"
 msgstr ""
 
@@ -5094,6 +5133,11 @@ msgstr "创建新 FAI 对象"
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
 
+#: include/class_socketClient.inc:108
+#, php-format
+msgid "Socket connection to host '%s:%s' failed: %s"
+msgstr ""
+
 #: include/class_socketClient.inc:191
 #, php-format
 msgid "Socket timeout of %s seconds reached."
@@ -5108,55 +5152,66 @@ msgstr ""
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:591
+#: include/class_ldap.inc:636
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:639
+#: include/class_ldap.inc:684
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:723
+#: include/class_ldap.inc:768
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:725
+#: include/class_ldap.inc:770
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:947
+#: include/class_ldap.inc:992
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr "这不是一条有效的 DN: '%s'。导入数据应该以 'dn:...' 开始于行 %s"
 
-#: include/class_ldap.inc:976
+#: include/class_ldap.inc:1021
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "导入 dn: '%s' 时错误，请从行 %s 开始检查您的 LDIF！"
 
-#: include/class_config.inc:106
+#: include/class_config.inc:107
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML 出错于 gosa.conf: %s ，行 %d"
 
-#: include/class_config.inc:228
+#: include/class_config.inc:242
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "无法绑定 LDAP。请联系系统管理员。"
 
-#: include/class_config.inc:561
+#: include/class_config.inc:574
 #, fuzzy
 msgid "SID and/or RIDBASE missing in the configuration!"
 msgstr "您的配置文件缺少 SID 和/或 RIDBASE！"
 
-#: include/password-methods/class_password-methods.inc:141
+#: include/class_config.inc:878
+#, fuzzy
+msgid "Configuration"
+msgstr "配置文件"
+
+#: include/class_config.inc:878
+msgid ""
+"The configuration file you are using seems to be outdated. Please move the "
+"GOsa configuration file away to run the GOsa setup again."
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:145
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -5164,17 +5219,17 @@ msgstr ""
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:788
+#: include/class_gosaSupportDaemon.inc:851
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "太多用户，无法分配一个可用的 ID！"
 
-#: include/class_gosaSupportDaemon.inc:1089
+#: include/class_gosaSupportDaemon.inc:1177
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_gosaSupportDaemon.inc:1109
+#: include/class_gosaSupportDaemon.inc:1197
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "未知 FAIstate %s"
@@ -5194,15 +5249,45 @@ msgstr "口令过期截止日"
 msgid "The user password was resetted, please set a new password value!"
 msgstr "您的口令已经过期 !! 选择一个新口令"
 
-#: include/class_tabs.inc:216
+#: include/class_tabs.inc:238
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "删除进程被插件 '%s' 取消: %s"
 
-#: include/class_tabs.inc:346
+#: include/class_tabs.inc:373
 msgid "References"
 msgstr "参考"
 
+#: include/class_baseSelectDialog.inc:44
+#, fuzzy
+msgid "Choose a base"
+msgstr "选择一个位置"
+
+#: include/class_baseSelectDialog.inc:55
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: include/class_baseSelectDialog.inc:61
+#, fuzzy
+msgid "Use"
+msgstr "用户"
+
+#: include/class_baseSelectDialog.inc:66
+msgid "Action"
+msgstr "行动"
+
+#: include/class_baseSelectDialog.inc:72
+#, fuzzy
+msgid "Filter entries with this syntax"
+msgstr "用这个语法过滤条目"
+
+#: include/class_baseSelectDialog.inc:136
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "选择一个位置"
+
 #: include/functions_helpviewer.inc:45
 #, php-format
 msgid "XML error in guide.xml: %s at line %d"
@@ -5230,60 +5315,60 @@ msgstr "%s 结果当您查找关键字 %s"
 msgid "%s%% hit rate in file %s"
 msgstr "%s%% 点击率于文件 %s"
 
-#: include/php_setup.inc:91
+#: include/php_setup.inc:95
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "生成这个页面导致 PHP 解析器发生一些错误！"
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 msgid "Send bug report to the GOsa Team"
 msgstr ""
 
-#: include/php_setup.inc:96
+#: include/php_setup.inc:100
 #, fuzzy
 msgid "Send bugreport"
 msgstr "发送者"
 
-#: include/php_setup.inc:101
+#: include/php_setup.inc:105
 msgid "Toggle information"
 msgstr "切换信息"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:115
 msgid "PHP error"
 msgstr "PHP 错误"
 
-#: include/php_setup.inc:130
+#: include/php_setup.inc:134
 msgid "class"
 msgstr "类"
 
-#: include/php_setup.inc:136
+#: include/php_setup.inc:140
 msgid "function"
 msgstr "功能"
 
-#: include/php_setup.inc:141
+#: include/php_setup.inc:145
 msgid "static"
 msgstr "静态"
 
-#: include/php_setup.inc:145
+#: include/php_setup.inc:149
 msgid "method"
 msgstr "方法"
 
-#: include/php_setup.inc:178
+#: include/php_setup.inc:182
 msgid "Trace"
 msgstr "跟踪"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "File"
 msgstr "文件"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Line"
 msgstr "行"
 
-#: include/php_setup.inc:179
+#: include/php_setup.inc:183
 msgid "Type"
 msgstr "类型"
 
-#: include/php_setup.inc:180
+#: include/php_setup.inc:184
 msgid "Arguments"
 msgstr "参数"
 
@@ -5291,12 +5376,12 @@ msgstr "参数"
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:150
+#: include/class_pluglist.inc:152
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
 #: include/class_pluglist.inc:167 include/class_pluglist.inc:168
-#: include/class_pluglist.inc:282
+#: include/class_pluglist.inc:280
 msgid "Unknown"
 msgstr "未知"
 
@@ -5343,234 +5428,234 @@ msgstr ""
 msgid "Cannot add location to the database!"
 msgstr "无法连接到数据库!"
 
-#: include/functions.inc:100
+#: include/functions.inc:101
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:107
+#: include/functions.inc:108
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:317
+#: include/functions.inc:318
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误：连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:379
+#: include/functions.inc:380
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:449
+#: include/functions.inc:450
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:594 include/functions.inc:680
+#: include/functions.inc:595 include/functions.inc:681
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目！"
 
-#: include/functions.inc:604
+#: include/functions.inc:605
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP 服务器"
 
-#: include/functions.inc:698
+#: include/functions.inc:699
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "发现要锁定的对象由多个锁。这虽然不可能──清除多个引用。"
 
-#: include/functions.inc:995
+#: include/functions.inc:996
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制！"
 
-#: include/functions.inc:997
+#: include/functions.inc:998
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1014
+#: include/functions.inc:1015
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1289
+#: include/functions.inc:1294
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1291
+#: include/functions.inc:1296
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1293
+#: include/functions.inc:1298
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "您将要拷贝条目 '%s'。"
 
-#: include/functions.inc:1477
+#: include/functions.inc:1482
 msgid "Entries per page"
 msgstr "每页条目数"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1510
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/functions.inc:1757
+#: include/functions.inc:1762
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1801
+#: include/functions.inc:1806
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa 开发版（版本 %s）"
 
-#: include/functions.inc:1880
+#: include/functions.inc:1885
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1914 include/functions.inc:1934
+#: include/functions.inc:1919 include/functions.inc:1939
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/functions.inc:2176 include/functions.inc:2180
-#: include/functions.inc:2186
+#: include/functions.inc:2181 include/functions.inc:2185
+#: include/functions.inc:2191
 #, fuzzy
 msgid "'base_hook' is not available. Using default base!"
 msgstr "警告： base_hook不可用。使用缺省 base。"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP 管理"
 
-#: include/functions.inc:2208
+#: include/functions.inc:2213
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "不能从服务器得到 schema 信息。无法对 schema 检查！"
 
-#: include/functions.inc:2234
+#: include/functions.inc:2239
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2241
+#: include/functions.inc:2246
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2284
+#: include/functions.inc:2289
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2286
+#: include/functions.inc:2291
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2292
+#: include/functions.inc:2297
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2294
+#: include/functions.inc:2299
 #, php-format
 msgid "Version mismatch for optional object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2303
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "文件可用。"
 
-#: include/functions.inc:2320
+#: include/functions.inc:2325
 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:2321
+#: include/functions.inc:2326
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2325
+#: include/functions.inc:2330
 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:2326
+#: include/functions.inc:2331
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2349
+#: include/functions.inc:2354
 msgid "German"
 msgstr "德语"
 
-#: include/functions.inc:2350
+#: include/functions.inc:2355
 msgid "French"
 msgstr "法语"
 
-#: include/functions.inc:2351
+#: include/functions.inc:2356
 msgid "Italian"
 msgstr "意大利语"
 
-#: include/functions.inc:2352
+#: include/functions.inc:2357
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: include/functions.inc:2353
+#: include/functions.inc:2358
 msgid "English"
 msgstr "英语"
 
-#: include/functions.inc:2354
+#: include/functions.inc:2359
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: include/functions.inc:2355
+#: include/functions.inc:2360
 msgid "Polish"
 msgstr "波兰语"
 
-#: include/functions.inc:2356
+#: include/functions.inc:2361
 msgid "Swedish"
 msgstr ""
 
-#: include/functions.inc:2357
+#: include/functions.inc:2362
 #, fuzzy
 msgid "Chinese"
 msgstr "芯片组"
 
-#: include/functions.inc:2358
+#: include/functions.inc:2363
 msgid "Russian"
 msgstr "俄语"
 
-#: include/functions.inc:2527
+#: include/functions.inc:2544
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/functions.inc:2559
+#: include/functions.inc:2577
 msgid "Cannot generate samba hash!"
 msgstr ""
 
@@ -5579,129 +5664,131 @@ msgstr ""
 msgid "Access control"
 msgstr "访问选项"
 
-#: include/class_acl.inc:205
+#: include/class_acl.inc:207
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:210 include/class_acl.inc:213
+#: include/class_acl.inc:212 include/class_acl.inc:215
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:465
+#: include/class_acl.inc:489
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:467
+#: include/class_acl.inc:491
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:472 include/class_acl.inc:473
+#: include/class_acl.inc:496 include/class_acl.inc:497
 #, fuzzy
 msgid "category ACL"
 msgstr "分类"
 
-#: include/class_acl.inc:518
+#: include/class_acl.inc:543
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:665 include/class_acl.inc:672
+#: include/class_acl.inc:698 include/class_acl.inc:705
 #, fuzzy
 msgid "Show/hide advanced settings"
 msgstr "高级电话设置"
 
-#: include/class_acl.inc:690
+#: include/class_acl.inc:723
 #, fuzzy
 msgid "Create objects"
 msgstr "创建新 FAI 对象"
 
-#: include/class_acl.inc:691
+#: include/class_acl.inc:724
 #, fuzzy
 msgid "Move objects"
 msgstr "成员对象"
 
-#: include/class_acl.inc:692
+#: include/class_acl.inc:725
 #, fuzzy
 msgid "Remove objects"
 msgstr "成员对象"
 
-#: include/class_acl.inc:694 include/class_acl.inc:700
+#: include/class_acl.inc:727 include/class_acl.inc:733
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:697
+#: include/class_acl.inc:730
 #, fuzzy
 msgid "Move object"
 msgstr "成员对象"
 
-#: include/class_acl.inc:698
+#: include/class_acl.inc:731
 #, fuzzy
 msgid "Remove object"
 msgstr "成员对象"
 
-#: include/class_acl.inc:705 include/class_acl.inc:796
+#: include/class_acl.inc:738 include/class_acl.inc:835
+#: include/class_acl.inc:839
 msgid "read"
 msgstr "读"
 
-#: include/class_acl.inc:706 include/class_acl.inc:798
+#: include/class_acl.inc:739 include/class_acl.inc:837
+#: include/class_acl.inc:840
 msgid "write"
 msgstr "写"
 
-#: include/class_acl.inc:710
+#: include/class_acl.inc:743
 #, fuzzy
 msgid "Complete object"
 msgstr "成员对象"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:879
 #, fuzzy, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "未知 FAIstate %s"
 
-#: include/class_acl.inc:869
+#: include/class_acl.inc:922
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "未知 FAIstate %s"
 
-#: include/class_acl.inc:929 include/class_acl.inc:931
+#: include/class_acl.inc:982 include/class_acl.inc:984
 #, fuzzy, php-format
 msgid "Role: %s"
 msgstr "角色"
 
-#: include/class_acl.inc:931
+#: include/class_acl.inc:984
 #, fuzzy
 msgid "unknown role"
 msgstr "! 未知 id"
 
-#: include/class_acl.inc:939
+#: include/class_acl.inc:992
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:948 ihtml/themes/default/acl.tpl:41
+#: include/class_acl.inc:1001 ihtml/themes/default/acl.tpl:77
 msgid "Members"
 msgstr "成员"
 
-#: include/class_acl.inc:954
+#: include/class_acl.inc:1007
 msgid "ACL takes effect for all users"
 msgstr ""
 
-#: include/class_acl.inc:1115
+#: include/class_acl.inc:1177
 #, fuzzy
 msgid "Access control list"
 msgstr "访问选项"
 
-#: include/class_acl.inc:1120
+#: include/class_acl.inc:1182
 #, fuzzy
 msgid "ACL roles"
 msgstr "MAC 地址"
 
-#: include/class_acl.inc:1123
+#: include/class_acl.inc:1185
 #, fuzzy
 msgid "Role name"
 msgstr "重命名"
 
-#: include/class_acl.inc:1124
+#: include/class_acl.inc:1186
 #, fuzzy
 msgid "Role description"
 msgstr "单元描述"
@@ -5777,28 +5864,33 @@ msgstr ""
 msgid "Sign in again"
 msgstr "重新登录"
 
-#: ihtml/themes/default/acl.tpl:15
+#: ihtml/themes/default/acl.tpl:31
+#, fuzzy
+msgid "Additional filter options"
+msgstr "应用程序设置"
+
+#: ihtml/themes/default/acl.tpl:42
 msgid "Use members from"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:56
 msgid "Available members"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:30
+#: ihtml/themes/default/acl.tpl:58 ihtml/themes/default/acl.tpl:63
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:42
+#: ihtml/themes/default/acl.tpl:79 ihtml/themes/default/acl.tpl:85
 msgid "List message recipients"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:63
+#: ihtml/themes/default/acl.tpl:107
 #, fuzzy
 msgid "ACL for this object"
 msgstr "检查 iconv 支持"
 
-#: ihtml/themes/default/acl.tpl:69
+#: ihtml/themes/default/acl.tpl:113
 #, fuzzy
 msgid "Available roles"
 msgstr "可用的应用程序"
@@ -6053,95 +6145,41 @@ msgstr "新口令"
 msgid "Change"
 msgstr "频道"
 
-#: ihtml/themes/default/pwd_heimdal.tpl:5
-#, fuzzy
-msgid "Heimdal options"
-msgstr "邮件选项"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:6
-msgid "Use empty values for infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:10
-msgid "Ticket max life"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:18
-msgid "Ticket max renew"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:32
-msgid "infinite"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:34
-msgid "Hour"
-msgstr "小时"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:36
-#, fuzzy
-msgid "Minute"
-msgstr "打印机"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:38
-#, fuzzy
-msgid "Day"
-msgstr "五月"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:40
-#, fuzzy
-msgid "Month"
-msgstr "月"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:42
-#, fuzzy
-msgid "Year"
-msgstr "查找"
-
-#: ihtml/themes/default/pwd_heimdal.tpl:47
-msgid "Valid ticket start time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:87
-msgid "Valid ticket end time"
-msgstr ""
-
-#: ihtml/themes/default/pwd_heimdal.tpl:127
-#, fuzzy
-msgid "Password end"
-msgstr "口令"
-
-#: html/main.php:153
+#: html/main.php:154
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:171
+#: html/main.php:172
 #, fuzzy
 msgid "PHP configuration"
 msgstr "PHP 安装检查"
 
-#: html/main.php:172
+#: html/main.php:173
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
 msgstr "致命错误：全局注册已打开。GOsa 将拒绝登录直到被管理修正。"
 
-#: html/main.php:217
+#: html/main.php:218
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:356
+#: html/main.php:292
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:361
 #, fuzzy
 msgid "Your password is about to expire, please change your password!"
 msgstr "您的口令就要过期，请修改您的口令"
 
-#: html/main.php:365
+#: html/main.php:370
 #, fuzzy
 msgid "Plugin"
 msgstr "于"
 
-#: html/main.php:366
+#: html/main.php:371
 #, fuzzy, php-format
 msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "警告： 没有发现针对插件 '%s' 的任何插件定义！"
@@ -6157,77 +6195,77 @@ msgid ""
 "ini settings."
 msgstr ""
 
-#: html/index.php:141 html/password.php:58
+#: html/index.php:142 html/password.php:58
 #, fuzzy, php-format
 msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
 
-#: html/index.php:166
+#: html/index.php:167
 #, fuzzy
 msgid "Smarty error"
 msgstr "PHP 错误"
 
-#: html/index.php:166 html/password.php:78 html/setup.php:66
+#: html/index.php:167 html/password.php:78 html/setup.php:66
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问！"
 
-#: html/index.php:217
+#: html/index.php:218
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:225
+#: html/index.php:226
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:229
+#: html/index.php:230
 msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 #, fuzzy
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "您 LDAP 的设置包含老的 schema 定义。请重新执行安装。"
 
-#: html/index.php:303
+#: html/index.php:304
 msgid "Please specify a valid username!"
 msgstr "请输入一个有效的用户名！"
 
-#: html/index.php:306
+#: html/index.php:307
 msgid "Please specify your password!"
 msgstr "请输入您的口令！"
 
-#: html/index.php:318
+#: html/index.php:319
 #, fuzzy
 msgid "Authentication error"
 msgstr "Nagios 鉴权"
 
-#: html/index.php:318
+#: html/index.php:319
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:325 html/password.php:228
+#: html/index.php:326 html/password.php:228
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:374
+#: html/index.php:375
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr "账户锁定。请联系管理员。"
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Session will not be encrypted."
 msgstr "会话不会被加密。"
 
-#: html/index.php:419 html/password.php:284
+#: html/index.php:420 html/password.php:284
 msgid "Enter SSL session"
 msgstr "进入 SSL 会话"
 
-#: html/index.php:425
+#: html/index.php:426
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -6263,6 +6301,49 @@ msgstr "帮助目录 '%s' 不能访问，无法读取任何帮助文件。"
 msgid "Smarty"
 msgstr "总结"
 
+#, fuzzy
+#~ msgid "Repository"
+#~ msgstr "仓库"
+
+#, fuzzy
+#~ msgid "DAK repository"
+#~ msgstr "目录"
+
+#, fuzzy
+#~ msgid "Delete users"
+#~ msgstr "删除用户"
+
+#, fuzzy
+#~ msgid "User successfully removed."
+#~ msgstr "导入成功"
+
+#, fuzzy
+#~ msgid "Heimdal options"
+#~ msgstr "邮件选项"
+
+#~ msgid "Hour"
+#~ msgstr "小时"
+
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "打印机"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "五月"
+
+#, fuzzy
+#~ msgid "Month"
+#~ msgstr "月"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "查找"
+
+#, fuzzy
+#~ msgid "Password end"
+#~ msgstr "口令"
+
 #, fuzzy
 #~ msgid "Missing parameters!"
 #~ msgstr "应用程序名称"
@@ -6397,10 +6478,6 @@ msgstr "总结"
 #~ msgid "sudo role"
 #~ msgstr "! 未知 id"
 
-#, fuzzy
-#~ msgid "Unknown option"
-#~ msgstr "未知"
-
 #, fuzzy
 #~ msgid "string"
 #~ msgstr "警告"
@@ -6445,10 +6522,6 @@ msgstr "总结"
 #~ msgid "Flags"
 #~ msgstr "类"
 
-#, fuzzy
-#~ msgid "Configuration"
-#~ msgstr "配置文件"
-
 #, fuzzy
 #~ msgid "Enable system deployment"
 #~ msgstr "系统管理"
@@ -6624,9 +6697,6 @@ msgstr "总结"
 #~ msgid "Select to see groups containing '%s'."
 #~ msgstr "选择查看包含用户的组"
 
-#~ msgid "Applications"
-#~ msgstr "应用程序"
-
 #, fuzzy
 #~ msgid "Workstations"
 #~ msgstr "工作站"
@@ -7429,9 +7499,6 @@ msgstr "总结"
 #~ msgid "Schedule"
 #~ msgstr "PHPscheduleit"
 
-#~ msgid "Action"
-#~ msgstr "行动"
-
 #, fuzzy
 #~ msgid "Reomve"
 #~ msgstr "删除"
@@ -7548,9 +7615,6 @@ msgstr "总结"
 #~ msgid "Services"
 #~ msgstr "服务"
 
-#~ msgid "FAI summary"
-#~ msgstr "自动化安装说明"
-
 #~ msgid "OGo"
 #~ msgstr "OGo"
 
@@ -7578,17 +7642,10 @@ msgstr "总结"
 #~ msgid "Packages"
 #~ msgstr "软件包"
 
-#~ msgid "System logs"
-#~ msgstr "系统日志"
-
 #, fuzzy
 #~ msgid "GOsa logs"
 #~ msgstr "Syslog 服务"
 
-#, fuzzy
-#~ msgid "Display entries with action %s."
-#~ msgstr "用这个语法过滤条目"
-
 #~ msgid ""
 #~ "Can't connect to glpi database, there is no mysl extension available in "
 #~ "your php setup."