* Updated locale

author cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>

Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)

committer cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>

Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)
author cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)
committer cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)
diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po

index da0fed6b3fa24f7b1b65cfeb4be14d596dea88e0..f92bec46cdea73e14da43a209285edb36d2c8a96 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-11-26 16:03+0100\n"
-"PO-Revision-Date: 2008-11-26 16:07+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
+"PO-Revision-Date: 2008-12-09 15:32+0100\n"
  "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
  "Language-Team: deutsch <de@li.org>\n"
  "MIME-Version: 1.0\n"
@@ -42,24 +42,24 @@ msgstr "Kopieren & Einfügen ist fehlgeschlagen!"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -77,12 +77,12 @@ msgstr "Kann Berechtigungen für '%s' nicht setzen"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -97,10 +97,10 @@ msgstr "'%s' ist kein gültiges LDAP-Objekt"
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  msgid "Internal error"
  msgstr "Interner Fehler"
  
@@ -119,8 +119,8 @@ msgstr "Diese Objekte werden eingefügt: %s"
  msgid "This object will be pasted: %s"
  msgstr "Dieses Objekt wird eingefügt: %s"
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Einfügen"
  
@@ -166,12 +166,14 @@ msgid "Use ACL defined in role"
  msgstr "Verwende ACL aus Rollendefinition"
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Benutzer"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Gruppen"
  
@@ -196,7 +198,7 @@ msgstr "Bearbeiten"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -238,8 +240,8 @@ msgstr "Alle Objekte im aktuellen Teilbaum"
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -313,44 +315,43 @@ msgstr "ACL wirkt für alle Benutzer"
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  msgid "LDAP error"
  msgstr "LDAP-Fehler"
  
@@ -461,15 +462,15 @@ msgstr ""
  "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
  "Administrator."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "sambaSID und/oder sambaRidBase fehlen in der Konfiguration!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid "Configuration"
  msgstr "Konfiguration"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -751,15 +752,16 @@ msgstr "Fehlenden %s PHP-Erweiterung!"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -767,15 +769,16 @@ msgid "Cancel"
  msgstr "Abbrechen"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -786,12 +789,13 @@ msgid "Ok"
  msgstr "Ok"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Anwenden"
@@ -802,7 +806,7 @@ msgstr "Anwenden"
  msgid "Save"
  msgstr "Speichern"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Hinzufügen"
@@ -843,19 +847,19 @@ msgstr "%s bearbeiten..."
  msgid "Back"
  msgstr "Zurück"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, php-format
  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."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -864,14 +868,14 @@ msgstr ""
  "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, "
  "müssen Sie zunächst die %s Einstellungen entfernen!"
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, php-format
  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."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -880,189 +884,180 @@ msgstr ""
  "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu "
  "aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
  
-#: include/utils/class_msgPool.inc:410
-#, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"Dieses Konto besitzt aktivierte %s-Einstellungen. Um sie zu deaktivieren, "
-"müssen Sie zunächst die %s Einstellungen deaktivieren!"
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, php-format
  msgid "Add %s settings"
  msgstr "%s Einstellungen hinzufügen"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, php-format
  msgid "Remove %s settings"
  msgstr "%s Einstellungen entfernen"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
  "Dialog zu ändern"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Januar"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Februar"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "März"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "April"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Mai"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Juni"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Juli"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "August"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "September"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Oktober"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "November"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Dezember"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Sunday"
  msgstr "Sonntag"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Monday"
  msgstr "Montag"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr "Dienstag"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr "Mittwoch"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr "Donnerstag"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr "Freitag"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr "Samstag"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "read operation"
  msgstr "Lese-Operation"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr "Hinzufügeoperation"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "modify operation"
  msgstr "Änderungs-Operation"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "delete operation"
  msgstr "Lösch-Operation"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "search operation"
  msgstr "Such-Operation"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "authentication"
  msgstr "Authentifizierung"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, php-format
  msgid "LDAP %s failed!"
  msgstr "LDAP %s fehlgeschlagen!"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  msgid "LDAP operation failed!"
  msgstr "LDAP-Operation fehlgeschlagen"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  msgid "Upload failed!"
  msgstr "Übertragung fehlgeschlagen!"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, php-format
  msgid "Upload failed: %s"
  msgstr "Übertragung fehlgeschlagen: %s"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  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:497
+#: include/utils/class_msgPool.inc:498
  #, php-format
  msgid "This '%s' is still in use."
  msgstr "Dieses '%s' ist noch in Benutzung."
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, 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:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr "Die Datei '%s' existiert nicht!"
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1071,32 +1066,32 @@ msgstr ""
  "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
  "prüfen Sie Ihre Konfigurationsdatei!"
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Kann Datei '%s' nicht löschen!"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Kann den Ordner '%s' nicht anlegen!"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Kann den Ordner '%s' nicht löschen!"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, php-format
  msgid "Checking for %s support"
  msgstr "Prüfe auf %s-Unterstützung"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -1105,20 +1100,20 @@ msgstr ""
  "Die Klasse '%s' kann nicht initialisiert werden! Vielleicht fehlt ein Modul "
  "in Ihren GOsa-Einstellungen?"
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr "GOsa support daemon"
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  msgid "Cannot not parse XML!"
  msgstr "XML-Nachricht kann nicht ausgewertet werden!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, 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:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr "Kann Eintrag %s nicht entfernen!"
@@ -1234,20 +1229,20 @@ msgstr "Verwenden"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Basis"
@@ -1260,36 +1255,36 @@ msgstr "Filtere Einträge mit dieser Syntax"
  msgid "Please fix the above error and reload the page."
  msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, 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:126
+#: include/functions.inc:127
  #, php-format
  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:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  msgid "Fatal error"
  msgstr "Schwerer Fehler"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, 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'."
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  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:466
+#: include/functions.inc:467
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
@@ -1297,11 +1292,11 @@ msgstr ""
  "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte "
  "kontaktieren Sie Ihren Administrator."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1310,14 +1305,14 @@ msgstr ""
  "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
  "Ihren Administrator!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr "Der LDAP-Server meldete: %s"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1326,19 +1321,19 @@ msgstr "Der LDAP-Server meldete: %s"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Warnung"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
@@ -1346,12 +1341,12 @@ msgstr ""
  "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
  "passieren - räume mehrere Referenzen auf."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, 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:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1360,73 +1355,73 @@ msgstr ""
  "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
  "Meldung bei Überschreitung wieder an"
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Konfigurieren"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "unvollständig"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Trotzdem Fortsetzen"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Trotzdem bearbeiten"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, 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:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "Einträge pro Seite"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Filter anwenden"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "GOsa Entwicklerversion (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr "Die Datei '%s' konnte nicht entfernt werden."
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  msgid "Cannot write to revision file!"
  msgstr "Kann nicht in Revisions-Datei schreiben!"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr "'baseIdHook' ist nicht verfügbar. Verwende die Standard-Basis!"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "LDAP warning"
  msgstr "LDAP-Warnung"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  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:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr "Verwendet, um kontenbezogene Informationen zu speichern."
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
@@ -1434,32 +1429,32 @@ msgstr ""
  "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um "
  "gleichzeitige Änderungen zu verhindern)."
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Die benötigte Objektklasse '%s' fehlt!"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr "Die optionale Objektklasse '%s' fehlt!"
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr "Falsche·Version·der·benötigten·Objektklasse·'%s'·(!=%s)!"
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr "Falsche Version der optionalen Objektklasse '%s' (!=%s)!"
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr "Verfügbare Klasse(n)"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  msgid ""
  "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
  "schema    configuration do not support this option."
@@ -1467,7 +1462,7 @@ msgstr ""
  "Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre "
  "Schema-Konfiguration unterstützt dies nicht."
  
-#: include/functions.inc:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
@@ -1475,7 +1470,7 @@ msgstr ""
  "Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse "
  "'posixGroup' AUXILIARY sein"
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  msgid ""
  "Your schema is configured to support the rfc2307bis group, but you have "
  "disabled this option on the 'ldap setup' step."
@@ -1483,58 +1478,58 @@ msgstr ""
  "Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie "
  "haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
  
-#: include/functions.inc:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr "Die Objektklasse 'posixGroup' muss STRUCTURAL sein"
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Deutsch"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Französisch"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Italienisch"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Spanisch"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Englisch"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Niederländisch"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Polnisch"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr "Chinesisch"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  msgid "Vietnamese"
  msgstr "Vietnamesisch"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Russisch"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  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:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr "Kann Samba-Hash nicht erzeugen!"
  
@@ -1596,7 +1591,7 @@ msgstr "Typ"
  msgid "Arguments"
  msgstr "Argumente"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  "Es konnte keine passende Passwort-Methode für den aktuellen Hash gefunden "
@@ -1650,7 +1645,7 @@ msgstr "Inkonsistente Enkodierung der DN erkannt: '%s'"
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Sie sind dabei den Snapshot '%s' zu entfernen."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr "Abzug wiederherstellen"
  
@@ -1675,19 +1670,19 @@ msgstr "Y-m-d, H:i:s"
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Beschreibung"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
@@ -1696,7 +1691,7 @@ msgstr ""
  "Sie sicher, dass niemand wichtige Änderungen vorgenommen hat, die verloren "
  "gehen, wenn Sie diesen Eintrag speichern!"
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1705,8 +1700,8 @@ msgstr ""
  "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
  "s' ist nicht gesetzt."
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1715,64 +1710,64 @@ msgstr ""
  msgid "Permission"
  msgstr "Berechtigung"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr "Ändere ACL dn"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr "von"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "to"
  msgstr "an"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr "Wiederherstellen"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr "Snapshot erstellen"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr "Erstelle einen neuen Snapshot dieses Objekts"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "Ausschneiden"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Diesen Eintrag ausschneiden"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "Kopieren"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Diesen Eintrag kopieren"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  msgid "Copy"
  msgstr "Kopieren"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  msgid "Cut"
  msgstr "Ausschneiden"
  
@@ -1788,7 +1783,7 @@ 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:49
+#: include/class_tabs.inc:51
  #, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
@@ -1797,12 +1792,12 @@ msgstr ""
  "Es wurde keine Plugin-Definition gefunden um '%s' zu Initialisieren. Bitte "
  "prüfen Sie Ihre Konfigurationsdatei!"
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, 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:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Referenzen"
  
@@ -1835,12 +1830,12 @@ msgstr "Referenzen"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1849,17 +1844,17 @@ msgstr "Referenzen"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Name"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Land"
  
@@ -1876,7 +1871,7 @@ msgstr "Name des Landes"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Administrative Einstellungen"
@@ -1939,7 +1934,7 @@ msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  msgid "Domain Component"
  msgstr "Domänen-Komponente"
  
@@ -1953,7 +1948,7 @@ msgstr "Name des zu erzeugenden Teilbaums"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Kategorie"
@@ -1968,20 +1963,20 @@ msgstr "Kategorie dieses Teilbaums"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Ort"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Land"
@@ -1998,7 +1993,7 @@ msgstr "Ort dieses Teilbaums"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2014,13 +2009,13 @@ msgstr "Postalische Anschrift dieses Teilbaums"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2035,13 +2030,13 @@ msgstr "Einleitende Telefonnummer dieses Teilbaums"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2053,8 +2048,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Einleitende Fax-Nummer dieses Teilbaums"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Abteilungen"
  
@@ -2062,7 +2057,7 @@ msgstr "Abteilungen"
  msgid "Manage Departments"
  msgstr "Abteilungen verwalten"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2078,7 +2073,7 @@ msgstr "Abteilungen verwalten"
  msgid "Permission error"
  msgstr "Berechtigungsfehler"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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 "
@@ -2088,7 +2083,7 @@ msgstr ""
  "Seite scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
  "Abteilungsverwaltung fort zu fahren."
  
-#: plugins/admin/departments/class_departmentManagement.inc:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
@@ -2098,29 +2093,29 @@ msgstr ""
  "scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
  "Abteilungsverwaltung fort zu fahren."
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
  msgstr "Standort"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Organisation"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2204,59 +2199,59 @@ msgstr ""
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr "Kann keinen unbenutzten Tag für diese administrative Einheit finden!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Markiere '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Fortsetzen"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Verschiebe '%s' nach '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Fehler beim kopieren von %s, breche ab"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Allgemein"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Name der Abteilung"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Telefon"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Objekt '%s' ist bereits markiert"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Entferne Markierung von Objekt '%s'"
@@ -2266,7 +2261,7 @@ msgid "Organization name"
  msgstr "Organisationsname"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Adresse"
  
@@ -2285,9 +2280,9 @@ msgstr "Liste der Abteilungen"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  msgid "Select all"
  msgstr "Alle auswählen"
  
@@ -2321,7 +2316,8 @@ msgstr "Aktualisieren"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Anlegen"
  
@@ -2333,7 +2329,7 @@ msgstr "Anlegen"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Entfernen"
  
@@ -2394,7 +2390,7 @@ msgstr "Zeige ACLs, auf die zutrifft"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Rolle"
@@ -2551,15 +2547,15 @@ msgid "Object group"
  msgstr "Objektgruppe"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2633,8 +2629,7 @@ msgid "Regular expression for matching group names"
  msgstr "Regulärer Ausdruck zum Erkennen von Gruppennamen"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2661,40 +2656,36 @@ msgstr ""
  "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
  "'Abbrechen' zum Abbruch."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Warteschlange"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  msgid "Systems"
  msgstr "Systeme"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Start"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Geräte"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "FAI-Übersicht"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Umgebung"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Anwendungen"
  
@@ -2733,7 +2724,7 @@ msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Objektgruppen"
  
@@ -2752,44 +2743,44 @@ msgstr "Infrastruktur Fehler"
  msgid "object group"
  msgstr "Objektgruppe"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Benutzer"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Gruppe"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Anwendung"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Server"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Arbeitsstation"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr "Windows Installation"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Drucker"
@@ -2808,115 +2799,122 @@ msgstr ""
  "Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe "
  "zusammenfassen!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "Abteilungen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  msgid "people"
  msgstr "Personen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "Gruppen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "Server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "Arbeitsstationen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "Terminals"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  msgid "printer"
  msgstr "Drucker"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "Drucker"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "Telefone"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "Anwendungen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "keine"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "zu viele unterschiedliche Objekte!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "Benutzer"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  msgid "winstations"
  msgstr "Windows-Arbeitsstationen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "deaktiviert"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "Vollzugriff"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "erlaube Zugriff auf diese Hosts"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "Unbekannte dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr "Die folgenden Systeme sind bereits für die Konfiguration über eine Objektgruppe vorgeseheb und können nicht hinzugefügt werden:"
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  msgid "You can combine two different object types at maximum, only!"
  msgstr "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr "Objektgruppe (Allgemein)"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  msgid "Sytem trust"
  msgstr "System-Vertrauen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr "Mitglied"
  
@@ -2965,7 +2963,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3002,7 +3000,7 @@ msgstr "Benutzername"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Vorlage"
@@ -3157,7 +3155,7 @@ msgid "Manage users"
  msgstr "Benutzer verwalten"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3168,7 +3166,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3195,18 +3193,18 @@ msgstr "Sie sind nicht berechtigt das Objekt '%s' zu verändern!"
  msgid "You have no permission to use this template!"
  msgstr "Sie sind nicht berechtigt diese Vorlage zu nutzen!"
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  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:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Vorname"
  
@@ -3250,10 +3248,10 @@ msgstr "Vorname"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Kennung"
  
@@ -3679,13 +3677,13 @@ msgid "POSIX account"
  msgstr "POSIX-Konto"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Mein Konto"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "Benutzer-ID"
  
@@ -3721,7 +3719,7 @@ msgstr "Shadow expire"
  msgid "System trust model"
  msgstr "Modell des System-Vertrauens"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  msgid "POSIX settings"
  msgstr "POSIX-Einstellungen"
  
@@ -3769,18 +3767,18 @@ msgid "Template name"
  msgstr "Name der Vorlage"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Titel"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Akademischer Titel"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Geburtsdatum"
  
@@ -3804,9 +3802,9 @@ msgid "Private phone"
  msgstr "Privat-Telefon"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Homepage"
@@ -3847,7 +3845,7 @@ msgid "Employee No."
  msgstr "Angestellten-Nr."
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Anstellungsart"
@@ -3860,69 +3858,69 @@ msgid "Room No."
  msgstr "Zimmer-Nr."
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Mobiltelefon"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Pager"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Anrede"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Aufgabengebiet"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Sachgebiet"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Amts-/Dienstbezeichnung"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Dienstort"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Referat"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Straße"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Postleitzahl"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Hausbezeichnung"
@@ -3932,13 +3930,13 @@ msgid "Please use the phone tab"
  msgstr "Verwenden sie den Telefon-Reiter"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "letzte Übermittlung"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Öffentlich sichtbar"
@@ -3949,7 +3947,7 @@ msgstr "Benutzer-Einstellungen"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -3964,7 +3962,7 @@ msgid "Set new password"
  msgstr "Neues Passwort setzen"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Benutzerbild"
  
@@ -4018,96 +4016,96 @@ msgstr "ungültig"
  msgid "No certificate installed"
  msgstr "Kein Zertifikat eingerichtet"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  msgid "Password method"
  msgstr "Passwort-Methode"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  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:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
  msgstr "Die gewählte Passwort-Methode benötigt eine initiale Konfiguration!"
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  msgid "Cannot open certificate!"
  msgstr "Kann Zertifikat nicht öffnen!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Zertifikat-Seriennummer"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr "Allgemeine Benutzereinstellungen"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Nachname"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr "Benutzerkennung"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr "Geschlecht"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr "Bevorzugte Sprache"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr "Abteilungsnummer"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr "Personalnummer"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr "Raumnummer"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr "Telefonnummer"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr "Pagernummer"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr "Mobiltelefon"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr "Faxnummer"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Private Adresse"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr "Telefonnummer (privat)"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  msgid "User password method"
  msgstr "Benutzer Passwort-Methode"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr "Benutzer-Zertifikate"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  msgid "You have no permission to set your password!"
  msgstr "Sie haben keine Berechtigung ihr Passwort zu speichern!"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Generische Benutzer-Information"
  
@@ -4196,7 +4194,7 @@ msgstr "Sie haben keine Berechtigung Ihr Passwort zu ändern."
  msgid "User password"
  msgstr "Benutzerpasswort"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  msgid "Password settings"
  msgstr "Passwort-Einstellungen"
  
@@ -5026,7 +5024,7 @@ msgstr ""
  msgid "Completed"
  msgstr "Abgeschlossen"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr "Vor"
  
@@ -5282,269 +5280,283 @@ msgstr "Deaktiviert"
  msgid "Enabled"
  msgstr "Aktiviert"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  msgid "LDAP inspection"
  msgstr "LDAP-Inspektion"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr "Untersuche Ihr LDAP-Verzeichnis auf GOsa-Kompatibilität"
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  msgid "Checking for root object"
  msgstr "Prüfe auf Wurzelobjekt"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr "Prüfe Berechtigungen auf die LDAP-Datenbank"
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  msgid "Checking for invisible departments"
  msgstr "Prüfe auf unsichtbare Abteilungen"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  msgid "Checking for invisible users"
  msgstr "Prüfe auf unsichtbare Benutzer"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  msgid "Checking for super administrator"
  msgstr "Prüfe auf Superadministrator"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  msgid "Checking for users outside the people tree"
  msgstr "Prüfe auf Benutzer ausserhalb des Benutzerbaums"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  msgid "Checking for groups outside the groups tree"
  msgstr "Prüfe auf Gruppen ausserhalb des Gruppenbaums"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr "Prüfe auf Windows-Arbeitsstationen ausserhalb des Winstation-Baums"
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  msgid "Checking for duplicated UID numbers"
  msgstr "Prüfe auf doppelte UID Nummern"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  msgid "Checking for duplicate GID numbers"
  msgstr "Prüfe auf doppelte GID Nummern"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  msgid "Checking for old style USB devices"
  msgstr "Prüfe auf alte USB-Geräte"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  msgid "Checking for old services that have to be migrated"
  msgstr "Prüfe auf alte Service-Einträge"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  msgid "Checking for old style application menus"
  msgstr "Prüfe auf alte Menü-Einträge"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  msgid "LDAP query failed"
  msgstr "LDAP-Abfrage fehlgeschlagen."
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr "Wahrscheinlich fehlt das Wurzelobjekt."
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, 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:299
+#: setup/class_setupStep_Migrate.inc:305
  #, 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:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Fehlgeschlagen"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  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:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  msgid "Migrate"
  msgstr "Migrieren"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  msgid "Move"
  msgstr "Verschieben"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr "Es wurde(n) %s Benutzer ausserhalb des konfigurierten Baums '%s' gefunden."
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, 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."
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, 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."
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  msgid "Migration error"
  msgstr "Migrationsfehler"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Die Abteilung '%s' kann nicht migriert werden:"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, 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:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr "GOsa 2.5 Verwaltungs-Konto gefunden: %s"
+
+#: setup/class_setupStep_Migrate.inc:1022
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Es gibt keinen GOsa 2.6 Administrator in Ihrem LDAP."
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr "Es gibt keinen GOsa Administrator in Ihrem LDAP."
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr "Kann ACL für Benutzer '%s' nicht hinzufügen:"
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Input error"
  msgstr "Eingabefehler"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr "Uid"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Password error"
  msgstr "Passwortfehler"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Provided passwords do not match!"
  msgstr "Die angegebenen Passwörter stimmen nicht überein!"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Specify a valid user ID!"
  msgstr "Geben Sie eine gültige Benutzer ID an!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, 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:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  msgid "Cannot move users to the requested department!"
  msgstr "Kann Benutzer nicht in die geforderte Abteilung verschieben!"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr "Die Windows-Arbeitsstation wird verschoben von"
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr "Aktualisiere ebenfalls die folgenden Referenzen"
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr "Die Gruppe wird verschoben von"
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr "Der Benutzer wird verschoben von"
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr "Die folgenden Referenzen werden aktualisiert"
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  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:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr "Versuche, das Wurzelobjekt zu erzeugen"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  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:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Kopieren von '%s' nach '%s' fehlgeschlagen:"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr "%s Geräte müssen migriert werden."
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr "Hinzufügen von '%s' ist fehlgeschlagen: %s"
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Aktualisierung von '%s' ist fehlgeschlagen: %s"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr "Es müssen %s Dienste migriert werden."
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr "Es müssen %s Menüs migriert werden."
@@ -5748,16 +5760,16 @@ msgid "Move selected groups into this group tree"
  msgstr "Verschiebe die ausgewählten Gruppen in diesen Gruppenbaum"
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr "Verstecke Änderungen"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  msgid "Show changes"
  msgstr "Zeige Änderungen"
  
@@ -5787,15 +5799,41 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Verschiebe die ausgewählten Benutzer in diesen Benutzerbaum"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Migriere GOsa 2.5 Administrator-Konten"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr "Dieser Dialog erlaubt die Migration von Administrativen Konten von GOsa 2.5 nach GOsa 2.6."
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+msgid "Current"
+msgstr "Aktuell"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+msgid "After migration"
+msgstr "Nach der Migration"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr "Neu laden"
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr "Abbrechen"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  msgid "Create a new GOsa administrator account"
  msgstr "Erzeuge ein neues GOsa Administratorkonto"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
@@ -5803,11 +5841,11 @@ msgstr ""
  "Dieser Dialog wird automatisch einen neuen Superadministrator in Ihren LDAP-"
  "Baum einfügen."
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  msgid "Password (again)"
  msgstr "Passwort (erneut)"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
@@ -5817,9 +5855,9 @@ msgstr ""
  "für eine Zahl von Einträgen ändern möchten, wählen Sie sie einfach aus und "
  "verwenden den 'Migrieren'-Knopf unterhalb."
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
@@ -5828,19 +5866,7 @@ msgstr ""
  "erfolgen wird, verwenden Sie den 'Zeige Änderungen'-Knopf um das LDIF zu "
  "sehen."
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-msgid "Current"
-msgstr "Aktuell"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-msgid "After migration"
-msgstr "Nach der Migration"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
@@ -5850,7 +5876,7 @@ msgstr ""
  "einen oder mehrere Benutzer ändern möchten, wählen Sie sie einfach aus und "
  "drücken Sie den 'Migrieren'-Knopf unterhalb."
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
@@ -5860,12 +5886,12 @@ msgstr ""
  "eines oder mehrere Geräte ändern möchten, wählen Sie sie einfach aus und "
  "drücken Sie den 'Migrieren'-Knopf unten."
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  msgid "Refresh"
  msgstr "Auffrischen"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
@@ -5876,7 +5902,7 @@ msgstr ""
  "möchten, wählen Sie sie einfach aus und drücken Sie den 'Migrieren'-Knopf "
  "unterhalb."
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6057,10 +6083,6 @@ msgstr "Verbindungs-URI"
  msgid "TLS connection"
  msgstr "TLS-Verbindung"
  
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr "Neu laden"
-
  #: setup/setup_ldap.tpl:69
  msgid "Authentication"
  msgstr "Authentisierung"
@@ -6439,7 +6461,7 @@ msgstr ""
  "Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
  "einen Klick auf Trotzdem bearbeiten übergehen."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr "Nur-Lesen"
  
diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po

index 782771b69e394e0e3ae3b9223b72922d8afc63ab..c5b83c7c817f0a00f7646e81499856a75dd77947 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
  "PO-Revision-Date: 2008-12-08 11:29+0100\n"
  "Last-Translator: \n"
  "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
@@ -38,24 +38,24 @@ msgstr "¡Ha fallado copiar y pegar! "
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -73,12 +73,12 @@ msgstr "No se pueden modificar los permisos para '%s'"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -93,10 +93,10 @@ msgstr "'%s' no es un objeto LDAP válido"
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  msgid "Internal error"
  msgstr "error interno"
  
@@ -115,8 +115,8 @@ msgstr "Estos objetos serán modificados: %s"
  msgid "This object will be pasted: %s"
  msgstr "Este objeto sera modificado: %s"
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Pegar"
  
@@ -162,12 +162,14 @@ msgid "Use ACL defined in role"
  msgstr "Utilizar las ACL definidas en el rol"
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Usuarios"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Grupos"
  
@@ -192,7 +194,7 @@ msgstr "Editar"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -234,8 +236,8 @@ msgstr "Todos los objetos en el subárbol actual"
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -309,44 +311,43 @@ msgstr "La ACL tendrá efecto para todos los usuarios"
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  msgid "LDAP error"
  msgstr "Error LDAP"
  
@@ -457,15 +458,15 @@ msgstr ""
  "No se puede conectar a LDAP: Por favor consulte con el administrador de "
  "sistemas."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid "Configuration"
  msgstr "Configuración"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -748,15 +749,16 @@ msgstr "¡Extensión PHP %s no encontrada!"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -764,15 +766,16 @@ msgid "Cancel"
  msgstr "Cancelar"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -783,12 +786,13 @@ msgid "Ok"
  msgstr "Ok"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Aplicar"
@@ -799,7 +803,7 @@ msgstr "Aplicar"
  msgid "Save"
  msgstr "Guardar"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Añadir"
@@ -840,20 +844,20 @@ msgstr "Editar %s..."
  msgid "Back"
  msgstr "Atrás"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "¡Esta cuenta tiene extensiones %s no validas!"
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
  msgstr ""
-"Esta cuenta tiene características %s activadas. Puede desactivarla "
-"pulsando aquí"
+"Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
+"aquí"
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -862,15 +866,15 @@ msgstr ""
  "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
  "necesita eliminar las caracteristicas %s primero!"
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
  msgstr ""
-"Esta cuenta tiene características %s desactivadas. Puede activarla "
-"pulsando aquí"
+"Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
+"aquí"
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -879,188 +883,179 @@ msgstr ""
  "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
  "necesita añadir las caracteristicas %s primero!"
  
-#: include/utils/class_msgPool.inc:410
-#, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
-"necesita añadir las caracteristicas %s primero!"
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, php-format
  msgid "Add %s settings"
  msgstr "Añadir caracteristicas %s"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, php-format
  msgid "Remove %s settings"
  msgstr "Eliminar las caracteristicas %s"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Pulse en el botón - Editar - para cambiar la información en esta ventana"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Enero"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Febrero"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Marzo"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Abril"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Mayo"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Junio"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Julio"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Agosto"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Septiembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Octubre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Noviembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Diciembre"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Sunday"
  msgstr "Domingo"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Monday"
  msgstr "Lunes"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr "Martes"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr "Miércoles"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr "Jueves"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr "Viernes"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr "Sábado"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "read operation"
  msgstr "lectura"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr "adición"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "modify operation"
  msgstr "modificación"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "delete operation"
  msgstr "eliminación"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "search operation"
  msgstr "busqueda"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "authentication"
  msgstr "autenticación"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, php-format
  msgid "LDAP %s failed!"
  msgstr "¡LDAP %s ha fallado!"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  msgid "LDAP operation failed!"
  msgstr "¡La consulta LDAP ha fallado!"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  msgid "Upload failed!"
  msgstr "¡Ha fallado el subir archivo!"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, php-format
  msgid "Upload failed: %s"
  msgstr "Ha fallado el subir archivo: %s"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr "'%s' esta todavía en uso por el objeto: %s"
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, php-format
  msgid "This '%s' is still in use."
  msgstr "'%s' esta todavía en uso."
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "'%s' esta todavía en uso por los objetos: %s"
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr "¡El archivo %s no existe!"
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "¡No se puede abrir el archivo '%s'!"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "¡No se puede grabar el archivo '%s'!"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1069,32 +1064,32 @@ msgstr ""
  "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
  "el archivo de configuración!"
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "¡No se puede eliminar el fichero '%s'!"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "¡No se puede crear la carpeta '%s'!"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "¡No se puede eliminar la carpeta '%s'!"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, php-format
  msgid "Checking for %s support"
  msgstr "Comprobando soporte %s"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr "Instala y activa el módulo de PHP %s."
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -1103,20 +1098,20 @@ msgstr ""
  "¡No se puede inicializar la clase '%s'! ¿Puede que falte la extensión "
  "correspondiente en la configuración de GOsa?"
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr "Demonio de soporte GOsa"
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  msgid "Cannot not parse XML!"
  msgstr "¡No se puede analizar el XML!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "¡No se puede enviar el evento abortar para la entrada %s!"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr "¡No se puede eliminar la entrada %s!"
@@ -1232,20 +1227,20 @@ msgstr "Usar"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Base"
@@ -1258,14 +1253,14 @@ msgstr "Filtrar entradas con esta sintaxis"
  msgid "Please fix the above error and reload the page."
  msgstr "Por favor solucione el problema y actualize la página."
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  "Error fatal: no se han definido un emplazamiento para las clases - por favor "
  "ejecute '%s' para solucionar esto"
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1273,23 +1268,23 @@ msgstr ""
  "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
  "ejecutando '%s'"
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  msgid "Fatal error"
  msgstr "Error fatal"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, php-format
  msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
  msgstr ""
  "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  msgid "Username / UID is not unique inside the LDAP tree!"
  msgstr "¡El nombre de usuario / UID no es único dentro del árbol LDAP!"
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
@@ -1297,13 +1292,13 @@ msgstr ""
  "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
  "contacte con su Administrador."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
  "desarrolladores!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1312,14 +1307,14 @@ msgstr ""
  "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte "
  "con su Administrador!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr "El servidor LDAP devolvio: %s"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1328,19 +1323,19 @@ msgstr "El servidor LDAP devolvio: %s"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Aviso"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
@@ -1348,12 +1343,12 @@ msgstr ""
  "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
  "Esto no debería ocurrir - limpiando referencias multiples."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1362,73 +1357,73 @@ msgstr ""
  "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
  "si se supera el límite máximo"
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Configurar"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "incompleto"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Continuar de cualquier manera"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Editar de cualquier manera"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "Has decidido editar las siguientes entradas LDAP %s"
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "Entradas por página"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Aplicar filtro"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Instantánea de desarrollo GOsa (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr "El archivo '%s' no puede ser eliminado."
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  msgid "Cannot write to revision file!"
  msgstr "¡No se puede escribir en el archivo de revisión!"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "LDAP warning"
  msgstr "Aviso LDAP"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  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:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr "Usado para guardar información específica de la cuenta."
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
@@ -1436,34 +1431,34 @@ msgstr ""
  "Usado para bloquear entradas editadas actualmente y así evitar múltiples "
  "cambios simultáneos."
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  "¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  "¡Las versiones de la clase de objeto opcional no coinciden '%s' (!=%s)!"
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr "Clase(s) disponibles"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  msgid ""
  "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
  "schema    configuration do not support this option."
@@ -1471,7 +1466,7 @@ msgstr ""
  "Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su "
  "configuración de esquemas no soporta esta opción."
  
-#: include/functions.inc:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
@@ -1479,7 +1474,7 @@ msgstr ""
  "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
  "debe ser AUXILIARY"
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  msgid ""
  "Your schema is configured to support the rfc2307bis group, but you have "
  "disabled this option on the 'ldap setup' step."
@@ -1487,51 +1482,51 @@ msgstr ""
  "Su esquema está configurado para soportar grupos rfc2307bis, pero ha "
  "desactivado esta opción en el paso 'configuración ldap'."
  
-#: include/functions.inc:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Alemán"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Francés"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Italiano"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Español"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Inglés"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Holandes"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Polaco"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr "Chino"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  msgid "Vietnamese"
  msgstr "Vietnamita"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Ruso"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1539,7 +1534,7 @@ msgstr ""
  "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
  "existir."
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr "¡No se puede generar la clave samba!"
  
@@ -1600,7 +1595,7 @@ msgstr "Tipo"
  msgid "Arguments"
  msgstr "Argumentos"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  "¡No se puede encontrar un método de codificación válido para la clave "
@@ -1656,7 +1651,7 @@ msgstr "Se ha detectado una codificación de DN inconsistente: '%s'"
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Va a eliminar la instantanea '%s'."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr "Recuperar instantanea"
  
@@ -1681,19 +1676,19 @@ msgstr "Y-m-d, H:i:s"
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Descripción"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
@@ -1701,7 +1696,7 @@ msgstr ""
  "Este objeto ha cambiado desde que ha sido abierto en GOsa. ¡Todos los "
  "cambios realizados por otros se perderán si graba esta entrada!"
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1710,8 +1705,8 @@ msgstr ""
  "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
  "está activo."
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1720,64 +1715,64 @@ msgstr ""
  msgid "Permission"
  msgstr "Permiso"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "No tiene permisos para crear una instantanea para %s."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "No tiene permisos para recuperar una instantanea para %s."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr "Modificando ACL dn"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr "desde"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "to"
  msgstr "a"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr "Recuperar"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr "Crear instantánea"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr "¡Crear una nueva instantánea de este objeto!"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "mover"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Mover esta entrada"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "copiar"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Copiar esta entrada"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  msgid "Copy"
  msgstr "Copiar"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  msgid "Cut"
  msgstr "Mover"
  
@@ -1794,7 +1789,7 @@ msgid "The user password was resetted, please set a new password value!"
  msgstr ""
  "¡La contraseña del usuario se ha eliminado, por favor introduzca una nueva!"
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
@@ -1803,12 +1798,12 @@ msgstr ""
  "No hay definiciones de extensión para iniciar '%s', por favor compruebe su "
  "archivo de configuración."
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Referencias"
  
@@ -1841,12 +1836,12 @@ msgstr "Referencias"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1855,17 +1850,17 @@ msgstr "Referencias"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Nombre"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "País"
  
@@ -1882,7 +1877,7 @@ msgstr "Nombre del País"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Parámetros administrativos"
@@ -1945,7 +1940,7 @@ msgstr "Marcar departamento como una unidad administrativa independiente"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  msgid "Domain Component"
  msgstr "Componentes del dominio"
  
@@ -1959,7 +1954,7 @@ msgstr "Nombre del subárbol a crear"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Categoría"
@@ -1974,20 +1969,20 @@ msgstr "Categoría para este subárbol"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Localización"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Provincia"
@@ -2004,7 +1999,7 @@ msgstr "Localización de este subárbol"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2020,13 +2015,13 @@ msgstr "Dirección postal de este subárbol"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2041,13 +2036,13 @@ msgstr "Número base de teléfono de este subárbol"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2059,8 +2054,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Número base de fax de este subárbol"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Departamentos"
  
@@ -2068,7 +2063,7 @@ msgstr "Departamentos"
  msgid "Manage Departments"
  msgstr "Gestionar Departamentos"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2084,7 +2079,7 @@ msgstr "Gestionar Departamentos"
  msgid "Permission error"
  msgstr "Error de Permisos"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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 "
@@ -2094,7 +2089,7 @@ msgstr ""
  "página y presionar el botón 'Continuar' para continuar con el asistente de "
  "administración de departamento."
  
-#: plugins/admin/departments/class_departmentManagement.inc:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
@@ -2104,29 +2099,29 @@ msgstr ""
  "final de la página y presionar el botón 'Continuar' para seguir al dialogo "
  "de gestión de departamento."
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
  msgstr "Localidad"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Organización"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2207,62 +2202,62 @@ msgstr ""
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr ""
-"¡No se puede encontrar una etiqueta sin usar para identificar "
-"la unidad administrativa!"
+"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
+"administrativa!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Etiquetando '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continuar"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Moviendo '%s' a '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Ha fallado a copiar %s, operación abortada"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Genérico"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Nombre de departamento"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Teléfono"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "El objeto '%s' está ya marcado"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Añadir marca (%s) al objeto '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Eliminando marca del objeto '%s'"
@@ -2272,7 +2267,7 @@ msgid "Organization name"
  msgstr "Nombre de la Organización"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Código Postal"
  
@@ -2291,9 +2286,9 @@ msgstr "Lista de Departamentos"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  msgid "Select all"
  msgstr "Seleccione todos"
  
@@ -2327,7 +2322,8 @@ msgstr "Enviar departamento"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Crear"
  
@@ -2339,7 +2335,7 @@ msgstr "Crear"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Eliminar"
  
@@ -2400,7 +2396,7 @@ msgstr "Mostrar las acl que coincidan con"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Rol"
@@ -2558,15 +2554,15 @@ msgid "Object group"
  msgstr "Grupo de objetos"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2640,8 +2636,7 @@ msgid "Regular expression for matching group names"
  msgstr "Expresión regular para buscar nombres de grupos"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2668,40 +2663,36 @@ msgstr ""
  "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
  "<i>Cancelar</i> para Abortar."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Cola telefónica"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  msgid "Systems"
  msgstr "Sistemas"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Inicio"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Dispositivos"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "Sumario FAI"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Entorno"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Aplicaciones"
  
@@ -2740,7 +2731,7 @@ msgstr "Expresiones regulares para buscar nombre de objetos"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Grupos de objetos"
  
@@ -2759,44 +2750,44 @@ msgstr "error de infraestructura"
  msgid "object group"
  msgstr "grupo de objetos"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Usuario"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Grupo"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Aplicación"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Servidor"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Estación de trabajo"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr "Instalación Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Impresora"
@@ -2815,115 +2806,122 @@ msgstr ""
  "¡No puede combinar terminales y estaciones de trabajo en un unico grupo de "
  "objetos!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "departamentos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  msgid "people"
  msgstr "usuarios"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "grupos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "servidores"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "estaciones de trabajo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "terminales"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  msgid "printer"
  msgstr "impresora"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "impresoras"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "teléfonos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "aplicaciones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "ninguno"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "¡demasiados objetos diferentes!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "usuarios"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  msgid "winstations"
  msgstr "Estación de trabajo Windows"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "desactivado"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "Acceso sin restricciones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "Permitir el acceso a estos equipos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "No existe el 'dn':"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  msgid "You can combine two different object types at maximum, only!"
  msgstr "¡Solo se puede combiar dos tipos de objetos diferentes como máximo!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr "Grupo de objetos genérico"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  msgid "Sytem trust"
  msgstr "Sistema de confianza"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr "Miembro"
  
@@ -2972,7 +2970,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3009,7 +3007,7 @@ msgstr "Nombre de Usuario"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Plantilla"
@@ -3164,7 +3162,7 @@ msgid "Manage users"
  msgstr "Gestión de usuarios"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3175,7 +3173,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3202,16 +3200,16 @@ msgstr "¡No tiene permisos para modificar el objeto '%s'!"
  msgid "You have no permission to use this template!"
  msgstr "¡No tiene permisos para usar esta plantilla!"
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  msgid "You have no permission to change the lock status for this user!"
  msgstr "¡No tiene permisos para cambiar el estado de bloqueo de este usuario!"
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Nombre de pila"
  
@@ -3256,10 +3254,10 @@ msgstr "Nombre"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Inicio"
  
@@ -3689,13 +3687,13 @@ msgid "POSIX account"
  msgstr "Cuenta POSIX"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Mi cuenta"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "Identificador (ID) de usuario"
  
@@ -3731,7 +3729,7 @@ msgstr "Shadow expire"
  msgid "System trust model"
  msgstr "Sistema de confianza"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  msgid "POSIX settings"
  msgstr "Parametros POSIX"
  
@@ -3778,18 +3776,18 @@ msgid "Template name"
  msgstr "Nombre de la plantilla"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Título Personal"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Títulos académicos"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Fecha de nacimiento"
  
@@ -3813,9 +3811,9 @@ msgid "Private phone"
  msgstr "Teléfono privado"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Página Web"
@@ -3856,7 +3854,7 @@ msgid "Employee No."
  msgstr "Número empleado"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Funciones laborales"
@@ -3869,69 +3867,69 @@ msgid "Room No."
  msgstr "Número sala"
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Móvil"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Buscapersonas"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Profesión"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Descripción de la unidad"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Área de desarrollo"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Función"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Lugar de residencia"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Unidad"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Calle"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Código Postal"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Tipo de Vía"
@@ -3941,13 +3939,13 @@ msgid "Please use the phone tab"
  msgstr "Por favor use la sección telefóno"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Última dirección conocida"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Visible por todos"
@@ -3958,7 +3956,7 @@ msgstr "Caracteristicas del usuario"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -3973,7 +3971,7 @@ msgid "Set new password"
  msgstr "Introducir nueva contraseña"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Foto del usuario"
  
@@ -4027,97 +4025,97 @@ msgstr "no válido"
  msgid "No certificate installed"
  msgstr "No hay certificados instalados"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  msgid "Password method"
  msgstr "Metodo de contraseña"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  msgid "The selected password method is no longer available."
  msgstr "El método de contraseña seleccionado no está disponible."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
  msgstr ""
  "¡El método de contraseña seleccionado necesita una configuració inicial!"
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  msgid "Cannot open certificate!"
  msgstr "¡No puedo abrir el certificado!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Número de serie del certificado"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr "Parámetros genéricos del usuario"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Apellido"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr "Identificación de Usuario"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr "Sexo"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr "Idioma preferido"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr "Número del departamento"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr "Número de empleado"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr "Número de habitación"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr "Número de teléfono"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr "Número del busca"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr "Teléfono móvil"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr "Número de Fax"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Dirección Postal personal"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr "Número de teléfono personal"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  msgid "User password method"
  msgstr "Metodo de contraseña de usuario"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr "Certificados de usuario"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  msgid "You have no permission to set your password!"
  msgstr "¡No tiene permisos para cambiar su contraseña!"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Información genérica del usuario"
  
@@ -4206,7 +4204,7 @@ msgstr "No tiene permisos para cambiar su contraseña."
  msgid "User password"
  msgstr "Contraseña del usuario"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  msgid "Password settings"
  msgstr "Parámetros de Contraseña"
  
@@ -4278,8 +4276,8 @@ msgid ""
  "<a\thref='https://oss.gonicus.de/labs/gosa/"
  "newticket'\ttarget='_blank'>Bugsubmitter</a>"
  msgstr ""
-"<a\thref='https://oss.gonicus.de/labs/gosa/"
-"newticket'\ttarget='_blank'>Envío incidencias</a>"
+"<a\thref='https://oss.gonicus.de/labs/gosa/newticket'\ttarget='_blank'>Envío "
+"incidencias</a>"
  
  #: html/password.php:58 html/index.php:142
  #, php-format
@@ -5028,7 +5026,7 @@ msgstr ""
  msgid "Completed"
  msgstr "Completado"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr "Siguiente"
  
@@ -5288,108 +5286,112 @@ msgstr "Desactivado"
  msgid "Enabled"
  msgstr "Activado"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  msgid "LDAP inspection"
  msgstr "Inspección LDAP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr "Analice la compatibilidad con GOsa de su directorio LDAP"
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  msgid "Checking for root object"
  msgstr "Comprobando objeto raíz"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr "Comprobando permisos en la base de datos LDAP"
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  msgid "Checking for invisible departments"
  msgstr "Comprobando departamentos invisibles"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  msgid "Checking for invisible users"
  msgstr "Comprobando usuarios invisibles"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  msgid "Checking for super administrator"
  msgstr "Comprobando súper administrador"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  msgid "Checking for users outside the people tree"
  msgstr "Comprobando cuentas fuera del árbol de usuarios"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  msgid "Checking for groups outside the groups tree"
  msgstr "Comprobando grupos fuera del árbol de grupos"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  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:174
+#: setup/class_setupStep_Migrate.inc:180
  msgid "Checking for duplicated UID numbers"
  msgstr "Comprobando números UID duplicados"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  msgid "Checking for duplicate GID numbers"
  msgstr "Comprobando números GID duplicados"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  msgid "Checking for old style USB devices"
  msgstr "Comprobando dispositivos por método antiguo"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  msgid "Checking for old services that have to be migrated"
  msgstr "Comprobando servicios antiguos que deben ser migrados"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  msgid "Checking for old style application menus"
  msgstr "Comprobando por menús con estilo antiguo"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  msgid "LDAP query failed"
  msgstr "La consulta LDAP ha fallado"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr "Posiblemente el objeto raíz está desaparecido"
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr "Encontrado '%s' valores duplicados del atributo 'uidNumber'."
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr "Encontrado '%s' valores duplicados del atributo 'gidNumber'."
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Error"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
@@ -5397,162 +5399,173 @@ msgstr ""
  "Se encontraron '%s' estaciones de trabajo windows fuera del contenedor ou de "
  "estaciones de trabajo windows '%s'"
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  msgid "Migrate"
  msgstr "Migrar"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, 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:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  msgid "Move"
  msgstr "Mover"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, 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:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, 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:647
+#: setup/class_setupStep_Migrate.inc:653
  #, 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:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  msgid "Migration error"
  msgstr "Error de migración"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "No puede migrar el departamento '%s':"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, 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:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "No hay cuenta de administrador GOsa en la base de datos LDAP."
+
+#: setup/class_setupStep_Migrate.inc:1039
  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:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr "No se puede añadir ACL para el usuario '%s':"
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Input error"
  msgstr "Error de entrada"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr "Uid"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Password error"
  msgstr "Error de contraseña"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Provided passwords do not match!"
  msgstr "¡La contraseñas introducidas no  coinciden!"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Specify a valid user ID!"
  msgstr "¡Por favor especifique un ID de usuario válido!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  "Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  msgid "Cannot move users to the requested department!"
  msgstr "¡No puedo mover los usuarios al departamento especificado!"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr "La estaciones de trabajo windows serán trasladadas desde"
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr "También se actualizaran las siguientes referencias"
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr "El grupo serán trasladado desde"
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr "El usuario serán trasladado desde"
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr "Las siguientes referencias se actualizaran"
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  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:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr "Intentando crear el objeto raíz"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  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:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Copia fallida de '%s' a '%s':"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr "Hay %s dispositivos que necesitan ser migrados."
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr "Añadiendo '%s' a LDAP ha fallado: %s"
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Actualizando '%s' ha fallado: %s"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr "Hay %s serviccios que necesitan ser migrados."
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr "Hay %s menu de aplicaciones que necesitan ser migrados."
@@ -5755,16 +5768,16 @@ msgid "Move selected groups into this group tree"
  msgstr "Mover grupos seleccionados en este árbol de grupos"
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr "Ocultar cambios"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  msgid "Show changes"
  msgstr "Mostrar cambios"
  
@@ -5794,15 +5807,42 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Mover usuarios seleccionados al árbol de usuarios"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Crear una nueva cuenta administrativa GOsa"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+msgid "Current"
+msgstr "Actual"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+msgid "After migration"
+msgstr "Despues de migrar"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr "Recargar"
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr "Cancelar"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  msgid "Create a new GOsa administrator account"
  msgstr "Crear una nueva cuenta administrativa GOsa"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
@@ -5810,11 +5850,11 @@ msgstr ""
  "Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol "
  "LDAP."
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  msgid "Password (again)"
  msgstr "Contraseña (de nuevo)"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
@@ -5824,9 +5864,9 @@ msgstr ""
  "GOsa. Si quiere modificar esto para algunas de las entradas, seleccionelas y "
  "pulse el botón migrar."
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
@@ -5834,19 +5874,7 @@ msgstr ""
  "Si quiere saber que se hará cuando se migren las entradas seleccionadas use "
  "el botón 'Mostrar cambios' para ver el LDIF."
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-msgid "Current"
-msgstr "Actual"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-msgid "After migration"
-msgstr "Despues de migrar"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
@@ -5856,7 +5884,7 @@ msgstr ""
  "Si quiere modificar esto para algunos de los usuarios, seleccionelos y pulse "
  "el botón migrar."
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
@@ -5866,12 +5894,12 @@ msgstr ""
  "GOsa. Si quiere modificar esto para algunas de los dispositivos "
  "seleccionelos y pulse el botón migrar."
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  msgid "Refresh"
  msgstr "Refresco"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
@@ -5881,7 +5909,7 @@ msgstr ""
  "Si quiere modificar esto para algunos de los servicios, seleccionelos y "
  "pulse el botón migrar."
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6061,10 +6089,6 @@ msgstr "URI de conexión"
  msgid "TLS connection"
  msgstr "Conexión TLS"
  
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr "Recargar"
-
  #: setup/setup_ldap.tpl:69
  msgid "Authentication"
  msgstr "Autenticación"
@@ -6429,7 +6453,7 @@ msgstr ""
  "mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, "
  "pulsando en el botón <i>Eliminar</i>."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr "Solo lectura"
  
@@ -6443,6 +6467,17 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Crear"
+
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
+#~ "necesita añadir las caracteristicas %s primero!"
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
@@ -7354,4 +7389,3 @@ msgstr ""
  #, fuzzy
  #~ msgid "GOsa logs"
  #~ msgstr "servicio de registro de GOsa"
-
diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po

index 91939f58f3af1362fd8a7b4f0a4476355437b83c..4cd3934e5d76a372d1203a97fee1c5e3ba45f957 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
  "PO-Revision-Date: 2008-11-30 14:15+0100\n"
  "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
  "Language-Team: french <fr@li.org>\n"
@@ -34,24 +34,24 @@ msgstr "Le copier/coller à échoué !"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -69,12 +69,12 @@ msgstr "Impossible d'attribuer les permissions pour '%s'"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -89,10 +89,10 @@ msgstr "'%s' n'est pas un objet LDAP valide"
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  msgid "Internal error"
  msgstr "Erreur interne"
  
@@ -111,8 +111,8 @@ msgstr "Ces objets seront collés : %s"
  msgid "This object will be pasted: %s"
  msgstr "Cet objet sera collé : %s"
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Coller"
  
@@ -158,12 +158,14 @@ msgid "Use ACL defined in role"
  msgstr "Utiliser l'ACL définie dans le rôle"
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Utilisateurs"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Groupes"
  
@@ -188,7 +190,7 @@ msgstr "Editer"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -230,8 +232,8 @@ msgstr "Tout les objets dans le sous arbres actuel"
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -305,44 +307,43 @@ msgstr "ACL valide pour tout les utilisateurs"
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  msgid "LDAP error"
  msgstr "Erreur LDAP"
  
@@ -392,7 +393,8 @@ msgstr ""
  
  #: include/class_ldap.inc:648
  #, 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 ""
  "Impossible de créer automatiquement des sous arbres avec le RDN '%s': object "
  "class non trouvé !"
@@ -455,15 +457,15 @@ msgstr ""
  "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
  "l'administrateur du système."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "sambaSID et/ou sambaRidBase absents de votre configuration !"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid "Configuration"
  msgstr ""
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -674,7 +676,8 @@ msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
  #: include/utils/class_msgPool.inc:225
  #, php-format
  msgid "Cannot execute '%s' command for plugin %s!"
-msgstr "Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
+msgstr ""
+"Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
  
  #: include/utils/class_msgPool.inc:227
  #, php-format
@@ -747,15 +750,16 @@ msgstr "Extension PHP %s manquante !"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -763,15 +767,16 @@ msgid "Cancel"
  msgstr "Annuler"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -782,12 +787,13 @@ msgid "Ok"
  msgstr "Ok"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Appliquer"
@@ -798,7 +804,7 @@ msgstr "Appliquer"
  msgid "Save"
  msgstr "Enregistrer"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Ajouter"
@@ -839,19 +845,20 @@ msgstr "Editer %s..."
  msgid "Back"
  msgstr "Retour"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Ce compte n'a pas d'extensions %s valides !"
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, 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 ""
  "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
  "cliquant sur le bouton ci-dessous."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -860,14 +867,15 @@ msgstr ""
  "Ce compte possède %s paramètres activés. Pour le désactiver vous devez au "
  "préalable supprimer les %s paramètres !"
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, 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 ""
  "Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
  "clicquant ci dessous."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -876,187 +884,180 @@ msgstr ""
  "Ce compte possède %s paramètres désactivés. Pour les activer, vous devez au "
  "préalable ajouter les %s paramètres !"
  
-#: include/utils/class_msgPool.inc:410
-#, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr "Ce compte a les paramètres pour les fonctionnalités %s. Pour les désactiver, vous devrez d'abord enlever les paramètres pour les fonctionnalités %s !"
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, php-format
  msgid "Add %s settings"
  msgstr "Ajouter %s paramètres"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, php-format
  msgid "Remove %s settings"
  msgstr "Effacer %s paramètres"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans "
  "cette boite de dialogue"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Janvier"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Février"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Mars"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Avril"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Mai"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Juin"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Juillet"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Août"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Septembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Octobre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Novembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Décembre"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Sunday"
  msgstr "Dimanche"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Monday"
  msgstr "Lundi"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr "Mardi"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr "Mercredi"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr "Jeudi"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr "Vendredi"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr "Samedi"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "read operation"
  msgstr "lecture"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr "ajout"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "modify operation"
  msgstr "modification"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "delete operation"
  msgstr "suppression"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "search operation"
  msgstr "recherche"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "authentication"
  msgstr "authentification"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, php-format
  msgid "LDAP %s failed!"
  msgstr "La requête LDAP %s à échoué !"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  msgid "LDAP operation failed!"
  msgstr "La requête LDAP à échoué !"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  msgid "Upload failed!"
  msgstr "Le téléchargement à échoué !"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, php-format
  msgid "Upload failed: %s"
  msgstr "Le téléchargement à échoué : %s"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr "Erreur de communication avec le service d'infrastructure !"
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr "Erreur de communication avec le service d'infrastructure : %s"
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr "Ce '%s' est en cours d'utilisation par : %s"
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, php-format
  msgid "This '%s' is still in use."
  msgstr "Ce '%s' est toujours en utilisation."
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "Ce '%s' est en utilisation par les objets : %s"
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr "Le fichier '%s' n'existe pas !"
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Impossible de lire le fichier '%s' !"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Impossible d'écrire dans le fichier '%s' !"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
@@ -1065,32 +1066,32 @@ msgstr ""
  "La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
  "votre fichier de configuration !"
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Impossible d'effacer le fichier '%s' !"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Impossible de créer le répertoire '%s' !"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Impossible d'effacer le répertoire '%s' !"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, php-format
  msgid "Checking for %s support"
  msgstr "Vérification du support pour %s"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr "Installer et activer le module PHP %s."
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
@@ -1099,20 +1100,20 @@ msgstr ""
  "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
  "extension dans votre installation de GOsa ?"
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr "GOsa support Service"
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  msgid "Cannot not parse XML!"
  msgstr "Impossible de lire le contenu du fichier XML"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Impossible d'envoyer l'evènement annuler pour l'entrée '%s' !"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr "Impossible d'enlever l'entrée %s !"
@@ -1229,20 +1230,20 @@ msgstr "Utilisation"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr ""
@@ -1255,38 +1256,40 @@ msgstr "Filtrer les entrées avec cette syntaxe"
  msgid "Please fix the above error and reload the page."
  msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  "Erreur fatale : pas d'emplacement défini pour les classes  - veuillez "
  "exécuter '%s' pour régler le problème"
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, 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 ""
  "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
  "'%s' pour essayer de régler le problème"
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  msgid "Fatal error"
  msgstr "Erreur Fatale"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, 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:397
+#: include/functions.inc:398
  msgid "Username / UID is not unique inside the LDAP tree!"
-msgstr "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
+msgstr ""
+"Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
@@ -1294,11 +1297,11 @@ msgstr ""
  "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP. "
  "Veuillez contacter votre administrateur système."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1307,14 +1310,14 @@ msgstr ""
  "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
  "Veuillez contacter votre administrateur !"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr "Le serveur LDAP à retourné: %s"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1323,19 +1326,19 @@ msgstr "Le serveur LDAP à retourné: %s"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Avertissement"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
@@ -1343,12 +1346,12 @@ msgstr ""
  "Détection de verrou multiple pour un même objet. Ceci ne devrait pas "
  "arriver. Effacement des références multiples."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, 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:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1357,73 +1360,73 @@ msgstr ""
  "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
  "toujours dépassée"
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Configurer"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "incomplet"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Continuer malgré tout"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Éditer malgré tout"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "Entrées par page"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Appliquer le filtre"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Version de développement de GOsa (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr "Le fichier '%s' ne peut pas être éffacé."
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  msgid "Cannot write to revision file!"
  msgstr "Impossible d'écrire le fichier de revision !"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "LDAP warning"
  msgstr "Avertissement LDAP"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr ""
  "Impossible de récupérer les informations sur les schémas depuis le serveur. "
  "Vérification des schémas impossibles !"
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr "Utilisé pour stocker les informations spécifiques des comptes."
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
@@ -1431,32 +1434,32 @@ msgstr ""
  "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
  "multiples changements simultanés."
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Object class obligatoire '%s' manquante !"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr "Object class facultative '%s' manquante !"
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr "La version requise des object class ne correspond pas '%s' (!=%s) !"
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr "La version des object class optionnels ne correspond pas '%s' (!=%s) !"
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr "Classe(s) disponible(s)"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  msgid ""
  "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
  "schema    configuration do not support this option."
@@ -1465,7 +1468,7 @@ msgstr ""
  "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
  "supportent pas cette option."
  
-#: include/functions.inc:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
@@ -1473,7 +1476,7 @@ msgstr ""
  "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
  "l'objectClass 'posixGroup' doit être       AUXILIARY"
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  msgid ""
  "Your schema is configured to support the rfc2307bis group, but you have "
  "disabled this option on the 'ldap setup' step."
@@ -1482,58 +1485,59 @@ msgstr ""
  "avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
  "ldap' du programme d'installation."
  
-#: include/functions.inc:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Allemand"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Français"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Italien"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Espagnol"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Anglais"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Hollandais"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Polonais"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr "Chinois"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  msgid "Vietnamese"
  msgstr "Vietnamien"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Russe"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, 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 ""
  "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
  "pas."
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr "Impossible de générer un hash samba !"
  
@@ -1595,7 +1599,7 @@ msgstr "Type"
  msgid "Arguments"
  msgstr "Arguments"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  "Impossible de trouver une méthode de cryptage correspondante pour le mot de "
@@ -1651,7 +1655,7 @@ msgstr "Encodage du inconsistant du DN détecté : '%s'"
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Vous êtes sur le point de supprimer le snapshot '%s'."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr "Restaurer la copie instantanée"
  
@@ -1676,19 +1680,19 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr ""
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
@@ -1696,7 +1700,7 @@ msgstr ""
  "Cet objet à changer depuis son ouverture dans GOsa. Tout les changement "
  "éffectués par les autres seront perdus si vous sauvez cette entrée !"
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1705,8 +1709,8 @@ msgstr ""
  "La fonctionnalité pour les copie instantanées est activée, mais la variable "
  "requise '%s' n'est pas configurée."
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1715,64 +1719,65 @@ msgstr ""
  msgid "Permission"
  msgstr "Permissions"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, php-format
  msgid "You are not allowed to create a snapshot for %s."
-msgstr "Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
+msgstr ""
+"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr "Changement du dn de l'acl"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr "de"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "to"
  msgstr "vers"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr "Restaurer"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr "Créer un snapshot"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr "Créer un nouveau snapshot depuis cet objet"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "couper"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Couper cette entrée"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "copier"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Copier cette entrée"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  msgid "Copy"
  msgstr "Copier"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  msgid "Cut"
  msgstr "Couper"
  
@@ -1790,7 +1795,7 @@ msgstr ""
  "Le mot de passe de l'utilisateur à été réinitialisé, veuillez entrer un "
  "nouveau mot de passe !"
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
@@ -1799,12 +1804,12 @@ msgstr ""
  "Pas de définition de plugin pour l'initialisation de '%s', veuillez vérifier "
  "votre fichier de configuration."
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, 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:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Références"
  
@@ -1837,12 +1842,12 @@ msgstr "Références"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1851,17 +1856,17 @@ msgstr "Références"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Nom"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Pays"
  
@@ -1878,7 +1883,7 @@ msgstr "Pays"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Paramètres administratifs"
@@ -1943,7 +1948,7 @@ msgstr "Marquer le département comme une entité administrative indépendante"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  msgid "Domain Component"
  msgstr "Objet Domaine"
  
@@ -1957,7 +1962,7 @@ msgstr "Nom de la branche à créer"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Catégorie"
@@ -1972,20 +1977,20 @@ msgstr "Catégorie pour cette branche de l'annuaire"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Lieu"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Département"
@@ -2002,7 +2007,7 @@ msgstr "Lieu de cette branche"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2018,13 +2023,13 @@ msgstr "Adresse postale de cette branche"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2039,13 +2044,13 @@ msgstr "Numéro de téléphone de base pour cette sous-branche"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2057,8 +2062,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Numéro de fax de base pour cette sous-branche"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Départements"
  
@@ -2066,7 +2071,7 @@ msgstr "Départements"
  msgid "Manage Departments"
  msgstr "Gérer les départements"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2082,7 +2087,7 @@ msgstr "Gérer les départements"
  msgid "Permission error"
  msgstr "Erreur de permissions"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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 "
@@ -2092,7 +2097,7 @@ msgstr ""
  "la page et appuyer sur 'Continuer' pour accèder à la gestion des "
  "départements."
  
-#: plugins/admin/departments/class_departmentManagement.inc:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
@@ -2101,29 +2106,29 @@ msgstr ""
  "Dès que l'opération de marquage est finie, vous pouvez aller à la fin de la "
  "page et "
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
  msgstr "Lieu"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Entreprise"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2207,59 +2212,59 @@ msgstr ""
  "Impossible de trouver un marqueur libre pour marquer l'entité "
  "administrative !"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Marquer '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continuer"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Bouger '%s' vers '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Impossible de copier %s, arrêt de l'opération"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Informations"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Nom du département"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Téléphone"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "L'objet '%s' est déjà marqué"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Ajouter une marque (%s) à l'objet '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Suppression de la marque de l'objet '%s'"
@@ -2269,7 +2274,7 @@ msgid "Organization name"
  msgstr "Nom de l'entreprise"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Adresse postale"
  
@@ -2288,9 +2293,9 @@ msgstr "Liste des départements"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  msgid "Select all"
  msgstr "Sélectionner tout"
  
@@ -2324,7 +2329,8 @@ msgstr "Soumettre le département"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Créer"
  
@@ -2336,7 +2342,7 @@ msgstr "Créer"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Supprimer"
  
@@ -2397,7 +2403,7 @@ msgstr "Afficher les acls correspondantes"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Rôle"
@@ -2499,7 +2505,8 @@ msgstr "Objet utilisé"
  #: plugins/admin/acl/class_aclRole.inc:649
  #, php-format
  msgid "This role cannot be removed while it is in use by these objects:"
-msgstr "Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
+msgstr ""
+"Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
  
  #: plugins/admin/acl/class_aclRole.inc:736
  msgid "Permissions"
@@ -2553,15 +2560,15 @@ msgid "Object group"
  msgstr "Groupes d'objets"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2635,8 +2642,7 @@ msgid "Regular expression for matching group names"
  msgstr "Expression régulière correspondant à des noms de groupe"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2664,40 +2670,36 @@ msgstr ""
  "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
  "'Annuler' pour abandonner."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Queue téléphonique"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  msgid "Systems"
  msgstr "Systèmes"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Démarrage"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Périphériques"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "Sommaire FAI"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Environnement"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Applications"
  
@@ -2736,7 +2738,7 @@ msgstr "Expression régulière pour trouver les objets correspondants"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Groupes d'objets"
  
@@ -2755,44 +2757,44 @@ msgstr "Erreur d'infrastructure"
  msgid "object group"
  msgstr "Groupes d'objets"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Utilisateur"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Groupes"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Applications"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Serveur"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Stations de travail"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr "Installation Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Imprimante"
@@ -2811,115 +2813,122 @@ msgstr ""
  "Vous ne pouvez pas combiner des terminaux et des stations de travail dans un "
  "groupe d'objet !"
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "départements"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  msgid "people"
  msgstr "utilisateurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "groupes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "serveurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "stations de travail"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "terminaux"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  msgid "printer"
  msgstr "imprimante"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "imprimantes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "téléphones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "aucun"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "nombre d'objets différents trop important !"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "utilisateurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  msgid "winstations"
  msgstr "Stations Windows"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "désactivé"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "accès complet"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "permettre l'accès a ces hôtes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "le dn n'existe pas :"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  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:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr "Groupes d'objets"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  msgid "Sytem trust"
  msgstr "Système de Confiance"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr "Membres"
  
@@ -2968,7 +2977,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3005,7 +3014,7 @@ msgstr "Nom d'utilisateur"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Modèle"
@@ -3160,7 +3169,7 @@ msgid "Manage users"
  msgstr "Gèrer les utilisateurs"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3171,7 +3180,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3200,18 +3209,18 @@ msgstr "Vous n'avez pas l'autorisation pour modifier l'objet '%s' !"
  msgid "You have no permission to use this template!"
  msgstr "Vous n'avez pas l'autorisation pour utiliser ce modèle !"
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  msgid "You have no permission to change the lock status for this user!"
  msgstr ""
  "Vous n'avez pas l'autorisation pour changer le verrouillage de cet "
  "utilisateur !"
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Prénom"
  
@@ -3256,10 +3265,10 @@ msgstr "Prénom"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Identifiant"
  
@@ -3371,7 +3380,8 @@ msgstr "! identifiant inconnu"
  #: plugins/admin/groups/class_groupGeneric.inc:728
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr "La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
+msgstr ""
+"La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
  
  #: plugins/admin/groups/class_groupGeneric.inc:954
  #, php-format
@@ -3693,13 +3703,13 @@ msgid "POSIX account"
  msgstr "Compte Posix"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Mon Compte"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "ID de l'utilisateur"
  
@@ -3735,13 +3745,14 @@ msgstr ""
  msgid "System trust model"
  msgstr "Système de Confiance"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  msgid "POSIX settings"
  msgstr "Paramètres Posix"
  
  #: plugins/personal/posix/posix_shadow.tpl:9
  msgid "User must change password on first login"
-msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors de sa première connexion"
  
  #: plugins/personal/posix/posix_shadow.tpl:34
  msgid "Password expires on"
@@ -3782,18 +3793,18 @@ msgid "Template name"
  msgstr "Nom du modèle"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Titre Personnel"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Titre Universitaire"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Date de naissance"
  
@@ -3817,9 +3828,9 @@ msgid "Private phone"
  msgstr "Numéro de téléphone privé"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Page d'accueil"
@@ -3860,7 +3871,7 @@ msgid "Employee No."
  msgstr "No. de l'employé."
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Type de l'employé"
@@ -3873,69 +3884,69 @@ msgid "Room No."
  msgstr "No. de bureau."
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "GSM"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Bip"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Travail"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Description de l'unité"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Zone de sujet"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Fonction"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Lieu de résidence"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Unité"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Rue"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Code postal"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Identifiant du bâtiment"
@@ -3945,13 +3956,13 @@ msgid "Please use the phone tab"
  msgstr "Veuillez utiliser l'onglet téléphone"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Dernière distribution"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Visible par tous"
@@ -3962,7 +3973,7 @@ msgstr "Préférences utilisateur"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -3977,7 +3988,7 @@ msgid "Set new password"
  msgstr "Attribuer un nouveau mot de passe"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Image de l'utilisateur"
  
@@ -4031,98 +4042,99 @@ msgstr "invalide"
  msgid "No certificate installed"
  msgstr "Pas de certificat installé"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  msgid "Password method"
  msgstr "Format de stockage des mots de passe"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  msgid "The selected password method is no longer available."
  msgstr ""
  "Le format de stockage sélectionné pour les mots de passe n'est plus "
  "disponible."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
-msgstr "Le format de stockage sélectionné nécessite une configuration de base !"
+msgstr ""
+"Le format de stockage sélectionné nécessite une configuration de base !"
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  msgid "Cannot open certificate!"
  msgstr "Impossible d'ouvrir le certificat !"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: 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:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr "Paramètres par défaut des utilisateurs"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Nom de famille"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr "Information Utilisateur"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr "Sexe"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr "Langue préférée"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr "Numéro du département"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr "Numéro de l'employé"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr "Numéro du bureau"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr "Numéro de téléphone"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr "Numéro de page"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr "Numéro de GSM"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr "Numéro de fax"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Adresse postale personnelle"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr "Numéro de téléphone privé"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  msgid "User password method"
  msgstr "Méthode d'encodage des mots de passe"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr "Certificats utilisateurs"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  msgid "You have no permission to set your password!"
  msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe !"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Information générales sur l'utilisateur"
  
@@ -4180,7 +4192,8 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
  
  #: plugins/personal/password/class_password.inc:85
  msgid "The password you've entered as 'New password' is empty."
-msgstr "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+msgstr ""
+"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
  
  #: plugins/personal/password/class_password.inc:88 html/password.php:204
  msgid "The password used as new and current are too similar."
@@ -4213,7 +4226,7 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
  msgid "User password"
  msgstr "Mot de passe"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  msgid "Password settings"
  msgstr "Préférences pour les mots de passe"
  
@@ -4223,7 +4236,8 @@ msgstr "Le changement du mot de passe n'est pas autorisé"
  
  #: plugins/personal/password/nochange.tpl:6
  msgid "You have no permission to change your password at this time"
-msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
+msgstr ""
+"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
  
  #: plugins/generic/references/class_reference.inc:51
  msgid "FAX"
@@ -4315,7 +4329,8 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
  
  #: html/password.php:249
  msgid "External password changer reported a problem: "
-msgstr "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
+msgstr ""
+"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
  
  #: html/password.php:280 html/index.php:415
  msgid "Session will not be encrypted."
@@ -4359,7 +4374,8 @@ msgstr ""
  
  #: html/index.php:267
  msgid "Cannot detect information about the installed LDAP schema!"
-msgstr "Impossible de détecter les information sur les schémas LDAP installés !"
+msgstr ""
+"Impossible de détecter les information sur les schémas LDAP installés !"
  
  #: html/index.php:280
  msgid "Your LDAP setup contains old schema definitions:"
@@ -4398,7 +4414,8 @@ msgstr ""
  #: html/main.php:148
  #, php-format
  msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
+msgstr ""
+"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
  
  #: html/main.php:167
  msgid "PHP configuration"
@@ -4422,7 +4439,8 @@ msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
  
  #: html/main.php:357
  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 !"
+msgstr ""
+"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
  
  #: html/main.php:366
  msgid "Plugin"
@@ -4519,7 +4537,8 @@ msgstr "Vérification de l'installation"
  
  #: setup/class_setupStep_Checks.inc:40
  msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Vérification de base de la version de PHP et des extensions nécéssaires."
+msgstr ""
+"Vérification de base de la version de PHP et des extensions nécéssaires."
  
  #: setup/class_setupStep_Checks.inc:64
  msgid "Checking PHP version"
@@ -4562,14 +4581,16 @@ msgstr "mbstring"
  
  #: setup/class_setupStep_Checks.inc:113
  msgid "GOsa requires this module to handle unicode strings."
-msgstr "GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
+msgstr ""
+"GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
  
  #: setup/class_setupStep_Checks.inc:120 setup/setup_config2.tpl:188
  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 à besion de ce module pour dialoguer avec les bases de données "
  "supportées."
@@ -4585,7 +4606,8 @@ msgstr ""
  "mots de passe Samba."
  
  #: setup/class_setupStep_Checks.inc:140
-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 ""
  "Déployez une installation gosa-si ou installer les modules perl Crypt::"
  "Smbash."
@@ -4655,7 +4677,8 @@ msgstr ""
  "mémoire pour les installations plus complexes."
  
  #: setup/class_setupStep_Checks.inc:178
-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 ""
  "Recherchez pour 'memory_limit' dans votre php.ini et mettez le à '32M' or "
  "plus haut."
@@ -4677,7 +4700,8 @@ msgid "The Execution time should be at least 30 seconds."
  msgstr "Le temps d'exécution doit être au moins de 30 secondes."
  
  #: setup/class_setupStep_Checks.inc:194
-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 ""
  "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
  "'30' ou plus."
@@ -4719,7 +4743,8 @@ msgstr ""
  "'off'."
  
  #: setup/class_setupStep_Checks.inc:218
-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 ""
  "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
  "mettez la à 'Off'."
@@ -4815,7 +4840,8 @@ msgid "Please specify a valid email address."
  msgstr "Veuillez indiquer une adresse de messagerie valide."
  
  #: setup/class_setupStep_Feedback.inc:184
-msgid "You have to select at least one of both options, subscribe or send feedback."
+msgid ""
+"You have to select at least one of both options, subscribe or send feedback."
  msgstr ""
  "Vous devez au moins avoir activé une option, souscrire ou envoyer votre "
  "retour d'information."
@@ -4842,7 +4868,8 @@ msgstr "Compresser les données envoyées au navigateur web"
  
  #: setup/setup_config1.tpl:27
  msgid "People and group storage"
-msgstr "Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
+msgstr ""
+"Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
  
  #: setup/setup_config1.tpl:30
  msgid "People DN attribute"
@@ -5042,7 +5069,7 @@ msgstr ""
  msgid "Completed"
  msgstr "Terminé"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr "Suivant"
  
@@ -5300,265 +5327,285 @@ msgstr "Désactivé"
  msgid "Enabled"
  msgstr "Activé"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  msgid "LDAP inspection"
  msgstr "Vérification de l'annuaire LDAP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr "Analyse de votre annuaire LDAP pour la compatibilité avec GOsa"
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  msgid "Checking for root object"
  msgstr "Recherche de l'objet racine"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr "Vérification des permissions sur l'annuaire LDAP"
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  msgid "Checking for invisible departments"
  msgstr "Vérification des départements invisibles"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  msgid "Checking for invisible users"
  msgstr "Vérification des utilisateurs invisibles"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  msgid "Checking for super administrator"
  msgstr "Vérification du superadministrateur"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  msgid "Checking for users outside the people tree"
  msgstr "Vérification d'utilisateurs en dehors de la branche people"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  msgid "Checking for groups outside the groups tree"
  msgstr "Vérification des groupes en dehors de la branche groups"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  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:174
+#: setup/class_setupStep_Migrate.inc:180
  msgid "Checking for duplicated UID numbers"
  msgstr "Vérification pour les uid en double"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  msgid "Checking for duplicate GID numbers"
  msgstr "Vérification pour les gid en double"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  msgid "Checking for old style USB devices"
  msgstr "Recherche de périphériques USB ancien style"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  msgid "Checking for old services that have to be migrated"
  msgstr "Vérification des anciens services qui devront être migré."
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  msgid "Checking for old style application menus"
  msgstr "Vérifier pour les menu des applications ancienne mode"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  msgid "LDAP query failed"
  msgstr "La requête LDAP à échoué"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr "L'objet racine est probablement manquant."
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, 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:299
+#: setup/class_setupStep_Migrate.inc:305
  #, 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:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Echec"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, 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 ""
  "J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
  "s'."
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  msgid "Migrate"
  msgstr "Migrer"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, 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:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  msgid "Move"
  msgstr "Bouger"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, 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:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, 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."
+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:647
+#: setup/class_setupStep_Migrate.inc:653
  #, 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:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  msgid "Migration error"
  msgstr "Erreur de migration"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Impossible de migrer le département '%s' :"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, 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:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Il n'y a pas d'administrateur GOsa dans votre annuaire LDAP."
+
+#: setup/class_setupStep_Migrate.inc:1039
  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:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr "Impossible d'ajouter une ACL pour l'utilisateur '%s' :"
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Input error"
  msgstr "Erreur d'entrée"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Password error"
  msgstr "Erreur de mot de passe"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  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:1057
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Specify a valid user ID!"
  msgstr "Le nom d'utilisateur est incorrect !"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
+msgstr ""
+"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  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:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr "Les stations windows seront bougées depuis"
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr "Mise à jour des références suivantes aussi"
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr "Les groupes seront bougés depuis"
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr "Les utilisateurs seront bougés depuis"
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr "Les références suivantes seront mises à jour"
  
-#: setup/class_setupStep_Migrate.inc:1822
-msgid "The LDAP root object is missing. It is required to use your LDAP service."
+#: setup/class_setupStep_Migrate.inc:1946
+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:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr "Essai de création de l'objet racine"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  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:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "La copie de '%s' vers '%s' à échoué :"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr "Il y a %s services qui ont besoin d'être migrés."
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr "L'ajout de '%s' à l'annuaire LDAP à échoué: %s"
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "La mise à jour de '%s' à échoué : %s"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr "Il y a %s services qui doivent être migrés."
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr "Il y a %s menu d'applications qui doivent être migrés."
@@ -5760,16 +5807,16 @@ msgid "Move selected groups into this group tree"
  msgstr "Bouger les groupes sélectionnés dans le groupe de base cet annuaire"
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr "Camoufler les changements"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  msgid "Show changes"
  msgstr "Montrer les changements"
  
@@ -5801,15 +5848,42 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Bouger les utilisateurs sélectionnés dans la branche utilisateurs."
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Créer un nouveau compte administrateur pour GOsa"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+msgid "Current"
+msgstr "Actuel"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+msgid "After migration"
+msgstr "Après migration"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr "Recharger"
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr "Annuler"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  msgid "Create a new GOsa administrator account"
  msgstr "Créer un nouveau compte administrateur pour GOsa"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
@@ -5817,11 +5891,11 @@ msgstr ""
  "Ce dialogue vas automatiquement créer un nouveau super utilisateur dans "
  "votre arbre LDAP."
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  msgid "Password (again)"
  msgstr "Mot de passe (de nouveau)"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
@@ -5831,9 +5905,9 @@ msgstr ""
  "utilisateur de GOsa. Si vous voulez changer cela pour un certain nombre "
  "d'entrée, sélectionnez les et utilisez le bouton migration ci dessous."
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
@@ -5842,19 +5916,7 @@ msgstr ""
  "sélectionnées, utilisez le bouton 'Montrer les changements' pour voir le "
  "fichier LDIF."
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-msgid "Current"
-msgstr "Actuel"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-msgid "After migration"
-msgstr "Après migration"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
@@ -5865,7 +5927,7 @@ msgstr ""
  "d'utilisateurs, veuillez les sélectionner et utiliser le bouton 'migration' "
  "ci dessous."
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
@@ -5875,12 +5937,12 @@ msgstr ""
  "GOsa. Si vous voulez changer ceci pour certains périphériques, veuillez les "
  "sélectionner et utiliser le bouton 'migration' ci dessous."
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  msgid "Refresh"
  msgstr "Rafraîchir"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
@@ -5890,7 +5952,7 @@ msgstr ""
  "Si vous voulez changer ceci certains services, veuillez les sélectionner et "
  "utiliser le bouton 'migration' ci dessous."
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6069,10 +6131,6 @@ msgstr "URI de connexion"
  msgid "TLS connection"
  msgstr "Connexion TLS"
  
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr "Recharger"
-
  #: setup/setup_ldap.tpl:69
  msgid "Authentication"
  msgstr "Authentification"
@@ -6087,7 +6145,8 @@ msgstr "Sélectionner un utilisateur"
  
  #: setup/setup_ldap.tpl:86
  msgid "Automatically append LDAP base to admin DN"
-msgstr "Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
+msgstr ""
+"Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
  
  #: setup/setup_ldap.tpl:93
  msgid "Admin password"
@@ -6453,7 +6512,7 @@ msgstr ""
  "d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
  "le bouton 'Éditer malgré tout'."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr "Lecture seule"
  
@@ -6469,3 +6528,14 @@ msgstr ""
  "Veuillez fermer la fenêtre de votre navigateur et vider les cache des mots "
  "de passe pour éviter l'authentification automatique par votre navigateur."
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Créer"
+
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "Ce compte a les paramètres pour les fonctionnalités %s. Pour les "
+#~ "désactiver, vous devrez d'abord enlever les paramètres pour les "
+#~ "fonctionnalités %s !"
diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po

index 9fbb5aadfc661513a199ad5ab83c18eb2b6ad1ed..cf9cb1642fe878d0d9f0662118fbbc9af5a044f5 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
  "PO-Revision-Date: 2005-11-18 15:26+0100\n"
  "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
  "Language-Team: Italian\n"
@@ -35,24 +35,24 @@ msgstr "Nome applicazione"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -70,12 +70,12 @@ msgstr "Rimuovi"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -91,10 +91,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  #, fuzzy
  msgid "Internal error"
  msgstr "Terminal Server"
@@ -114,8 +114,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  #, fuzzy
  msgid "Paste"
  msgstr "Data"
@@ -168,12 +168,14 @@ msgid "Use ACL defined in role"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Utenti"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Gruppi di utenti"
  
@@ -199,7 +201,7 @@ msgstr "Modifica"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -243,8 +245,8 @@ msgstr ""
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -324,44 +326,43 @@ msgstr ""
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  #, fuzzy
  msgid "LDAP error"
  msgstr "Errore LDAP"
@@ -466,17 +467,17 @@ 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:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "Scarica il file di  configurazione"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  #, fuzzy
  msgid "Configuration"
  msgstr "File di configurazione"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -772,15 +773,16 @@ msgstr "Elimina foto"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -788,15 +790,16 @@ msgid "Cancel"
  msgstr "Annulla"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -807,12 +810,13 @@ msgid "Ok"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Applica"
@@ -823,7 +827,7 @@ msgstr "Applica"
  msgid "Save"
  msgstr "Salva"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Aggiungi"
@@ -864,18 +868,18 @@ msgstr "Modifica contatto"
  msgid "Back"
  msgstr "Indietro"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, fuzzy, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Questa identità non possiede estensioni GOsa."
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
  msgstr "Questa identià possiede estensioni Unix."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -884,13 +888,13 @@ msgstr ""
  "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
  "le estensioni Samba / ambiente."
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
  msgstr "Questa identità non possiede estensioni Unix"
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -899,251 +903,242 @@ msgstr ""
  "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
  "le estensioni Samba / ambiente."
  
-#: include/utils/class_msgPool.inc:410
-#, fuzzy, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
-"le estensioni Samba / ambiente."
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, fuzzy, php-format
  msgid "Add %s settings"
  msgstr "Opzioni applicazione"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, fuzzy, php-format
  msgid "Remove %s settings"
  msgstr "Impostazioni Unix"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
  "questo dialogo"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Gennaio"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Febbraio"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Marzo"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Aprile"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Maggio"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Giugno"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Luglio"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Agosto"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Settembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Ottobre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Novembre"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Dicembre"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Sunday"
  msgstr "Cognome"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Monday"
  msgstr "mese"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "read operation"
  msgstr "Opzioni di posta"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "modify operation"
  msgstr "Informazioni personali"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "delete operation"
  msgstr "Selezione le workstation da aggiungere"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "search operation"
  msgstr "L'account spira dopo"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "authentication"
  msgstr "Destinazione"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, fuzzy, php-format
  msgid "LDAP %s failed!"
  msgstr "La query al database è fallita!"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  #, fuzzy
  msgid "LDAP operation failed!"
  msgstr "La query al database è fallita!"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  #, fuzzy
  msgid "Upload failed!"
  msgstr "Nome applicazione"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, fuzzy, php-format
  msgid "Upload failed: %s"
  msgstr "Utenti di Dominio"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, fuzzy, php-format
  msgid "This '%s' is still in use."
  msgstr "Nome descrittivo del gruppo"
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, fuzzy, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "Nome descrittivo del gruppo"
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Rimuovi"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Rimuovi"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, fuzzy, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Rimuovi"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, fuzzy, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Vai al dipartimento base"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, fuzzy, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Rimuovi"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, fuzzy, php-format
  msgid "Checking for %s support"
  msgstr "Controllo il supporto per iconv"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  #, fuzzy
  msgid "Cannot not parse XML!"
  msgstr "Troppi utenti non posso allocare un ID libero!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, fuzzy, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Rimuovi"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr ""
@@ -1261,20 +1256,20 @@ msgstr "Utenti"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Base"
@@ -1288,36 +1283,36 @@ msgstr "Mostra gli indirizzi che corrispondono"
  msgid "Please fix the above error and reload the page."
  msgstr ""
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  #, fuzzy
  msgid "Fatal error"
  msgstr "Terminal Server"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, 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:397
+#: include/functions.inc:398
  #, 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:466
+#: include/functions.inc:467
  #, fuzzy
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1325,11 +1320,11 @@ msgid ""
  msgstr ""
  "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1337,14 +1332,14 @@ msgid ""
  msgstr ""
  "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr ""
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1353,207 +1348,207 @@ msgstr ""
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Attenzione"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
  msgstr ""
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr ""
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
  "exceeds"
  msgstr ""
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Configura"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "incompleto"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  #, fuzzy
  msgid "Continue anyway"
  msgstr "Continua"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  #, fuzzy
  msgid "Edit anyway"
  msgstr "Modifica contatto"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, 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:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr ""
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "versione di sviluppo di GOsa (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  #, fuzzy
  msgid "Cannot write to revision file!"
  msgstr "Rimuovi"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "LDAP warning"
  msgstr "Amministrazione LDAP"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr ""
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, fuzzy, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Lista dei dipartimenti"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr ""
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Tedesco"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Francese"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Italiano"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Spagnolo"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Inglese"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Tedesco"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  #, fuzzy
  msgid "Polish"
  msgstr "Inglese"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  #, fuzzy
  msgid "Chinese"
  msgstr "reset"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  #, fuzzy
  msgid "Vietnamese"
  msgstr "Nome"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Russo"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1613,7 +1608,7 @@ msgstr "Tipo"
  msgid "Arguments"
  msgstr "Argomenti"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1668,7 +1663,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr ""
  
@@ -1694,33 +1689,33 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Descrizione"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1730,73 +1725,73 @@ msgstr ""
  msgid "Permission"
  msgstr "Permessi"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, fuzzy, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, fuzzy, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  #, fuzzy
  msgid "from"
  msgstr "e"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "to"
  msgstr "Rapporto"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  #, fuzzy
  msgid "Restore"
  msgstr "Riprova"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Crea estensioni di posta"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Gruppo di oggetti"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  #, fuzzy
  msgid "cut"
  msgstr "Esegui"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Modifica questo record"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr ""
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Modifica questo record"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  #, fuzzy
  msgid "Copy"
  msgstr "Azienda"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  #, fuzzy
  msgid "Cut"
  msgstr "Esegui"
@@ -1815,19 +1810,19 @@ 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:49
+#: include/class_tabs.inc:51
  #, fuzzy, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
  "configuration file."
  msgstr "Impossibile connettersi al server del database!"
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr ""
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Riferimenti"
  
@@ -1860,12 +1855,12 @@ msgstr "Riferimenti"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1874,17 +1869,17 @@ msgstr "Riferimenti"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Cognome"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Paese"
  
@@ -1902,7 +1897,7 @@ msgstr "Paese"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  #, fuzzy
  msgid "Administrative settings"
@@ -1968,7 +1963,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "Amministratori di Dominio"
@@ -1983,7 +1978,7 @@ msgstr ""
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr ""
@@ -1998,20 +1993,20 @@ msgstr ""
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Località"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Stato"
@@ -2028,7 +2023,7 @@ msgstr ""
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2044,13 +2039,13 @@ msgstr ""
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2065,13 +2060,13 @@ msgstr ""
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2083,8 +2078,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr ""
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Dipartimenti"
  
@@ -2093,7 +2088,7 @@ msgstr "Dipartimenti"
  msgid "Manage Departments"
  msgstr "Dipartimenti"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2110,44 +2105,44 @@ msgstr "Dipartimenti"
  msgid "Permission error"
  msgstr "Permessi"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "Località"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Organizzazione"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2218,60 +2213,60 @@ msgstr ""
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continua"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Generale"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  #, fuzzy
  msgid "Department name"
  msgstr "Dipartimento"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Telefono"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
@@ -2282,7 +2277,7 @@ msgid "Organization name"
  msgstr "Organizzazione"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "CAP"
  
@@ -2301,9 +2296,9 @@ msgstr "Lista dei dipartimenti"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  #, fuzzy
  msgid "Select all"
  msgstr "Rimuovi"
@@ -2338,7 +2333,8 @@ msgstr "Imposta dipartimento"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Creare"
  
@@ -2350,7 +2346,7 @@ msgstr "Creare"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Rimuovi"
  
@@ -2415,7 +2411,7 @@ msgstr "Mosra gruppi corrispondenti a"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Ruolo"
@@ -2587,15 +2583,15 @@ msgid "Object group"
  msgstr "Gruppo di oggetti"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2679,8 +2675,7 @@ msgid "Regular expression for matching group names"
  msgstr "Espressioni regolare per selezionare il nome del gruppo"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2707,42 +2702,38 @@ msgstr ""
  "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
  "i> per abortire."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  #, fuzzy
  msgid "Phone queue"
  msgstr "Numero di telefono"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  #, fuzzy
  msgid "Systems"
  msgstr "Sistemi"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Avvio"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Dispositivi"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Ambiente"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Applicazioni"
  
@@ -2781,7 +2772,7 @@ msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Gruppi di oggetti"
  
@@ -2803,45 +2794,45 @@ msgstr "Errore PHP"
  msgid "object group"
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Gruppo"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Applicazione"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Server"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  #, fuzzy
  msgid "Terminal"
  msgstr "Terminali"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Stampante"
@@ -2858,120 +2849,127 @@ msgstr "Informazioni"
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "dipartimenti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  #, fuzzy
  msgid "people"
  msgstr "Mostra persone"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "gruppi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  #, fuzzy
  msgid "printer"
  msgstr "stampanti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "stampanti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "telefoni"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "applicazioni"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "nessuno"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "utenti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  #, fuzzy
  msgid "winstations"
  msgstr "Amministrazione"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "disabilitato"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "accesso completo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "accesso limitato ai seguenti host"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  #, fuzzy
  msgid "Object group generic"
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Accesso ai sistemi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  #, fuzzy
  msgid "Member"
  msgstr "Membri"
@@ -3018,7 +3016,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3056,7 +3054,7 @@ msgstr "Nome utente"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr ""
@@ -3237,7 +3235,7 @@ msgid "Manage users"
  msgstr "Utenti di Dominio"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3246,7 +3244,7 @@ msgstr "Le password nuova e ripetuta non corrispondono"
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3276,17 +3274,17 @@ msgstr "Non hai il permesso di cambiare la tua password."
  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:656
+#: plugins/admin/users/class_userManagement.inc:652
  #, fuzzy
  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:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Nome"
  
@@ -3326,10 +3324,10 @@ msgstr "Liste di blocco"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Nome utente"
  
@@ -3781,13 +3779,13 @@ msgid "POSIX account"
  msgstr "Estenzioni FTP"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Identità"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr ""
  
@@ -3830,7 +3828,7 @@ msgstr "Mostra persone"
  msgid "System trust model"
  msgstr "Accesso ai sistemi"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  #, fuzzy
  msgid "POSIX settings"
  msgstr "Impostazioni Unix"
@@ -3878,18 +3876,18 @@ msgid "Template name"
  msgstr "Template"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Titolo onorifico"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Titolo di studio"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Data di nascita"
  
@@ -3913,9 +3911,9 @@ msgid "Private phone"
  msgstr "Telefono privato"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Home Page"
@@ -3957,7 +3955,7 @@ msgid "Employee No."
  msgstr "Matricola"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Qualifica"
@@ -3970,69 +3968,69 @@ msgid "Room No."
  msgstr "Stanza No."
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Cellulare"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Pager"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Descrizoione unità"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Funzione"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Località personale"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Unità"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Strada"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "CAP"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Identificativo della casa"
@@ -4042,13 +4040,13 @@ msgid "Please use the phone tab"
  msgstr "Usa il tab del telefono"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Ultimo recapito"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Pubblico"
@@ -4060,7 +4058,7 @@ msgstr "Opzioni di posta dell'identità"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -4077,7 +4075,7 @@ msgid "Set new password"
  msgstr "Cambia password"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  #, fuzzy
  msgid "User picture"
  msgstr "Foto personale"
@@ -4132,113 +4130,113 @@ msgstr "invalido"
  msgid "No certificate installed"
  msgstr "Non ci sono certificati installati"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  #, fuzzy
  msgid "Password method"
  msgstr "Algorimo password"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  msgid "The selected password method is no longer available."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  #, fuzzy
  msgid "Cannot open certificate!"
  msgstr "Impossibile aprite il certificato selezionato!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Numero seriale del certificato"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Impostazioni generali delle code"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Cognome"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  #, fuzzy
  msgid "User identification"
  msgstr "Amministrazione utenti"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  #, fuzzy
  msgid "Gender"
  msgstr "Generale"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  #, fuzzy
  msgid "Preferred language"
  msgstr "Lingua preferita"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  #, fuzzy
  msgid "Department number"
  msgstr "Dipartimento"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  #, fuzzy
  msgid "Employee number"
  msgstr "Qualifica"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  #, fuzzy
  msgid "Room number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  #, fuzzy
  msgid "Telefon number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  #, fuzzy
  msgid "Pager number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  #, fuzzy
  msgid "Mobile number"
  msgstr "Cellulare"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  #, fuzzy
  msgid "Fax number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  #, fuzzy
  msgid "Home phone number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "Algorimo password"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  #, fuzzy
  msgid "User certificates"
  msgstr "Certificato standard"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  #, fuzzy
  msgid "You have no permission to set your password!"
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Informazioni generali"
  
@@ -4330,7 +4328,7 @@ msgstr "Non hai il permesso di cambiare la tua password."
  msgid "User password"
  msgstr "Nuova password"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  #, fuzzy
  msgid "Password settings"
  msgstr "Opzioni di posta dell'identità"
@@ -5187,7 +5185,7 @@ msgstr ""
  msgid "Completed"
  msgstr "incompleto"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr ""
  
@@ -5460,284 +5458,299 @@ msgstr "disabilitato"
  msgid "Enabled"
  msgstr "disabilitato"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  #, fuzzy
  msgid "LDAP inspection"
  msgstr "Ispezione della configurazione PHP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  #, fuzzy
  msgid "Checking for root object"
  msgstr "Controllo il supporto per iconv"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  #, fuzzy
  msgid "Checking for invisible departments"
  msgstr "Controllo il supporto per iconv"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  #, fuzzy
  msgid "Checking for invisible users"
  msgstr "Controllo il supporto per iconv"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  #, fuzzy
  msgid "Checking for super administrator"
  msgstr "Controllo la presenza di alcuni programmi addizionali"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  #, fuzzy
  msgid "Checking for users outside the people tree"
  msgstr "Controllo il modulo cups"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  #, fuzzy
  msgid "Checking for groups outside the groups tree"
  msgstr "Controllo il modulo cups"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  #, fuzzy
  msgid "Checking for duplicated UID numbers"
  msgstr "Controllo il supporto per %s"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  #, fuzzy
  msgid "Checking for duplicate GID numbers"
  msgstr "Controllo il supporto per %s"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "Controllo il supporto per iconv"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "Controllo il modulo cups"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "Controllo il supporto per %s"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  #, fuzzy
  msgid "LDAP query failed"
  msgstr "La query al database è fallita!"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Fallito"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  #, fuzzy
  msgid "Migrate"
  msgstr "Creare"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, 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:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  #, fuzzy
  msgid "Move"
  msgstr "Dominio"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  #, fuzzy
  msgid "Migration error"
  msgstr "Creare"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, fuzzy, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Vai al dipartimento base"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Crea estensioni di posta"
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Input error"
  msgstr "Errore PHP"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Password error"
  msgstr "La password spira il"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Provided passwords do not match!"
  msgstr "Le password nuova e ripetuta non corrispondono"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Specify a valid user ID!"
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  #, fuzzy
  msgid "Cannot move users to the requested department!"
  msgstr "Mostra utenti del dipartimento"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  #, fuzzy
  msgid "Try to create root object"
  msgstr "Gruppo di oggetti"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Utenti di Dominio"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -5947,17 +5960,17 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  #, fuzzy
  msgid "Hide changes"
  msgstr "Open-Xchange"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  #, fuzzy
  msgid "Show changes"
  msgstr "Mostra telefoni"
@@ -5984,83 +5997,99 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Nuovo template"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Crea estensioni di posta"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+#, fuzzy
+msgid "Current"
+msgstr "Password attuale"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+#, fuzzy
+msgid "After migration"
+msgstr "Amministrazione utenti"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+#, fuzzy
+msgid "Reload"
+msgstr "leggere"
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr ""
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  #, fuzzy
  msgid "Create a new GOsa administrator account"
  msgstr "Crea estensioni di posta"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  #, fuzzy
  msgid "Password (again)"
  msgstr "Algorimo password"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-#, fuzzy
-msgid "Current"
-msgstr "Password attuale"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-#, fuzzy
-msgid "After migration"
-msgstr "Amministrazione utenti"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "Riferimenti"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6241,11 +6270,6 @@ msgstr "Connessione"
  msgid "TLS connection"
  msgstr "Connessione"
  
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "leggere"
-
  #: setup/setup_ldap.tpl:69
  #, fuzzy
  msgid "Authentication"
@@ -6591,7 +6615,7 @@ msgid ""
  "pressing the 'Edit anyway' button."
  msgstr ""
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr ""
  
@@ -6605,6 +6629,18 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Creare"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare "
+#~ "prima le estensioni Samba / ambiente."
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po

index 63fcde84b4ed6fcc9690ef2520153511948d0f49..b95c7750efb1e6cfa7c669b73e15438b7bb7f510 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,24 +36,24 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -71,12 +71,12 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -91,10 +91,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  msgid "Internal error"
  msgstr ""
  
@@ -113,8 +113,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr ""
  
@@ -160,12 +160,14 @@ msgid "Use ACL defined in role"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr ""
  
@@ -190,7 +192,7 @@ msgstr ""
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -232,8 +234,8 @@ msgstr ""
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -307,44 +309,43 @@ msgstr ""
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  msgid "LDAP error"
  msgstr ""
  
@@ -442,15 +443,15 @@ msgstr ""
  msgid "Cannot bind to LDAP. Please contact the system administrator."
  msgstr ""
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr ""
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid "Configuration"
  msgstr ""
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -728,15 +729,16 @@ msgstr ""
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -744,15 +746,16 @@ msgid "Cancel"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -763,12 +766,13 @@ msgid "Ok"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr ""
@@ -779,7 +783,7 @@ msgstr ""
  msgid "Save"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr ""
@@ -820,268 +824,261 @@ msgstr ""
  msgid "Back"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, php-format
  msgid "This account has no valid %s extensions!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
  "the %s settings first!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
  "the %s settings first!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:410
-#, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, php-format
  msgid "Add %s settings"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, php-format
  msgid "Remove %s settings"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Sunday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Monday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "read operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "modify operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "delete operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "search operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "authentication"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, php-format
  msgid "LDAP %s failed!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  msgid "LDAP operation failed!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  msgid "Upload failed!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, php-format
  msgid "Upload failed: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, php-format
  msgid "This '%s' is still in use."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, php-format
  msgid "Cannot delete file '%s'!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, php-format
  msgid "Cannot create folder '%s'!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, php-format
  msgid "Checking for %s support"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  msgid "Cannot not parse XML!"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr ""
@@ -1194,20 +1191,20 @@ msgstr ""
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr ""
@@ -1220,57 +1217,57 @@ msgstr ""
  msgid "Please fix the above error and reload the page."
  msgstr ""
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  msgid "Fatal error"
  msgstr ""
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, php-format
  msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
  msgstr ""
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  msgid "Username / UID is not unique inside the LDAP tree!"
  msgstr ""
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
  msgstr ""
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
  "administrator!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr ""
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1279,200 +1276,200 @@ msgstr ""
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr ""
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
  msgstr ""
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr ""
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
  "exceeds"
  msgstr ""
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr ""
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr ""
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr ""
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr ""
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr ""
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr ""
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr ""
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  msgid "Cannot write to revision file!"
  msgstr ""
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "LDAP warning"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr ""
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr ""
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr ""
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr ""
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr ""
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr ""
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr ""
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr ""
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr ""
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr ""
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  msgid "Vietnamese"
  msgstr ""
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr ""
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1532,7 +1529,7 @@ msgstr ""
  msgid "Arguments"
  msgstr ""
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1584,7 +1581,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr ""
  
@@ -1609,33 +1606,33 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr ""
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1644,64 +1641,64 @@ msgstr ""
  msgid "Permission"
  msgstr ""
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr ""
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr ""
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "to"
  msgstr ""
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr ""
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr ""
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr ""
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr ""
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr ""
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr ""
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr ""
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  msgid "Copy"
  msgstr ""
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  msgid "Cut"
  msgstr ""
  
@@ -1717,19 +1714,19 @@ msgstr ""
  msgid "The user password was resetted, please set a new password value!"
  msgstr ""
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
  "configuration file."
  msgstr ""
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr ""
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr ""
  
@@ -1762,12 +1759,12 @@ msgstr ""
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1776,17 +1773,17 @@ msgstr ""
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr ""
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr ""
  
@@ -1803,7 +1800,7 @@ msgstr ""
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr ""
@@ -1866,7 +1863,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  msgid "Domain Component"
  msgstr ""
  
@@ -1880,7 +1877,7 @@ msgstr ""
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr ""
@@ -1895,20 +1892,20 @@ msgstr ""
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr ""
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr ""
@@ -1925,7 +1922,7 @@ msgstr ""
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -1941,13 +1938,13 @@ msgstr ""
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -1962,13 +1959,13 @@ msgstr ""
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -1980,8 +1977,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr ""
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr ""
  
@@ -1989,7 +1986,7 @@ msgstr ""
  msgid "Manage Departments"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2005,43 +2002,43 @@ msgstr ""
  msgid "Permission error"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2111,59 +2108,59 @@ msgstr ""
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
@@ -2173,7 +2170,7 @@ msgid "Organization name"
  msgstr ""
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr ""
  
@@ -2192,9 +2189,9 @@ msgstr ""
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  msgid "Select all"
  msgstr ""
  
@@ -2228,7 +2225,8 @@ msgstr ""
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr ""
  
@@ -2240,7 +2238,7 @@ msgstr ""
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr ""
  
@@ -2301,7 +2299,7 @@ msgstr ""
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr ""
@@ -2454,15 +2452,15 @@ msgid "Object group"
  msgstr ""
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2536,8 +2534,7 @@ msgid "Regular expression for matching group names"
  msgstr ""
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2560,40 +2557,36 @@ msgstr ""
  msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  msgid "Systems"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr ""
  
@@ -2632,7 +2625,7 @@ msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr ""
  
@@ -2651,44 +2644,44 @@ msgstr ""
  msgid "object group"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr ""
@@ -2705,115 +2698,122 @@ msgstr ""
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  msgid "people"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  msgid "printer"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  msgid "winstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  msgid "Sytem trust"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr ""
  
@@ -2857,7 +2857,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -2894,7 +2894,7 @@ msgstr ""
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr ""
@@ -3049,7 +3049,7 @@ msgid "Manage users"
  msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3058,7 +3058,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3085,16 +3085,16 @@ msgstr ""
  msgid "You have no permission to use this template!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  msgid "You have no permission to change the lock status for this user!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr ""
  
@@ -3132,10 +3132,10 @@ msgstr ""
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr ""
  
@@ -3552,13 +3552,13 @@ msgid "POSIX account"
  msgstr ""
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr ""
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr ""
  
@@ -3594,7 +3594,7 @@ msgstr ""
  msgid "System trust model"
  msgstr ""
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  msgid "POSIX settings"
  msgstr ""
  
@@ -3638,18 +3638,18 @@ msgid "Template name"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr ""
  
@@ -3673,9 +3673,9 @@ msgid "Private phone"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr ""
@@ -3716,7 +3716,7 @@ msgid "Employee No."
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr ""
@@ -3729,69 +3729,69 @@ msgid "Room No."
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr ""
@@ -3801,13 +3801,13 @@ msgid "Please use the phone tab"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr ""
@@ -3818,7 +3818,7 @@ msgstr ""
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -3833,7 +3833,7 @@ msgid "Set new password"
  msgstr ""
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr ""
  
@@ -3885,96 +3885,96 @@ msgstr ""
  msgid "No certificate installed"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  msgid "Password method"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  msgid "The selected password method is no longer available."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  msgid "Cannot open certificate!"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  msgid "User password method"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr ""
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  msgid "You have no permission to set your password!"
  msgstr ""
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr ""
  
@@ -4056,7 +4056,7 @@ msgstr ""
  msgid "User password"
  msgstr ""
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  msgid "Password settings"
  msgstr ""
  
@@ -4794,7 +4794,7 @@ msgstr ""
  msgid "Completed"
  msgstr ""
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr ""
  
@@ -5045,262 +5045,276 @@ msgstr ""
  msgid "Enabled"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  msgid "LDAP inspection"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  msgid "Checking for root object"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  msgid "Checking for invisible departments"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  msgid "Checking for invisible users"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  msgid "Checking for super administrator"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  msgid "Checking for users outside the people tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  msgid "Checking for groups outside the groups tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  msgid "Checking for duplicated UID numbers"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  msgid "Checking for duplicate GID numbers"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  msgid "Checking for old style USB devices"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  msgid "Checking for old services that have to be migrated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  msgid "Checking for old style application menus"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  msgid "LDAP query failed"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  msgid "Migrate"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  msgid "Move"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  msgid "Migration error"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, php-format
  msgid "Cannot migrate department '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Input error"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Password error"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Provided passwords do not match!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Specify a valid user ID!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  msgid "Cannot move users to the requested department!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, php-format
  msgid "Updating '%s' failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -5486,16 +5500,16 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr ""
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  msgid "Show changes"
  msgstr ""
  
@@ -5520,78 +5534,92 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr ""
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr ""
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+msgid "Current"
+msgstr ""
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+msgid "After migration"
+msgstr ""
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr ""
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr ""
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  msgid "Create a new GOsa administrator account"
  msgstr ""
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  msgid "Password (again)"
  msgstr ""
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-msgid "Current"
-msgstr ""
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-msgid "After migration"
-msgstr ""
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  msgid "Refresh"
  msgstr ""
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -5754,10 +5782,6 @@ msgstr ""
  msgid "TLS connection"
  msgstr ""
  
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr ""
-
  #: setup/setup_ldap.tpl:69
  msgid "Authentication"
  msgstr ""
@@ -6080,7 +6104,7 @@ msgid ""
  "pressing the 'Edit anyway' button."
  msgstr ""
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr ""
  
diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po

index cd1fa5cdf1198ba27e4cba7058691dfec4f55517..5f92055191fd277c0a48dda043a8aed63fae3a46 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\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"
@@ -39,24 +39,24 @@ msgstr "Kopieren &amp; plakken wizard"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -74,12 +74,12 @@ msgstr "Kan bestand '%s' niet aanmaken."
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -95,10 +95,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  #, fuzzy
  msgid "Internal error"
  msgstr "Terminal server"
@@ -118,8 +118,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Plakken"
  
@@ -172,12 +172,14 @@ msgid "Use ACL defined in role"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Gebruikers"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Groepen"
  
@@ -202,7 +204,7 @@ msgstr "Bewerken"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -245,8 +247,8 @@ msgstr ""
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -327,44 +329,43 @@ msgstr ""
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  #, fuzzy
  msgid "LDAP error"
  msgstr "LDAP fout:"
@@ -474,17 +475,17 @@ msgstr ""
  "Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
  "systeembeheerder."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  #, fuzzy
  msgid "Configuration"
  msgstr "Configuratie bestand"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -785,15 +786,16 @@ msgstr "Verwijder printer mogelijkheden"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -801,15 +803,16 @@ msgid "Cancel"
  msgstr "Annuleren"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -820,12 +823,13 @@ msgid "Ok"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Toepassen"
@@ -836,7 +840,7 @@ msgstr "Toepassen"
  msgid "Save"
  msgstr "Opslaan"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Toevoegen"
@@ -877,12 +881,12 @@ msgstr "Bewerk gebruiker"
  msgid "Back"
  msgstr "Terug"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, fuzzy, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Dit account heeft geen geldige GOsa extensies."
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
@@ -890,7 +894,7 @@ msgstr ""
  "Dit account heeft POSIX mogelijkheden ingeschakeld. U kunt deze uitschakelen "
  "door de knop hieronder te gebruiken."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -899,7 +903,7 @@ msgstr ""
  "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
  "moet u eerst het samba / omgevings account verwijderen."
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
@@ -907,7 +911,7 @@ msgstr ""
  "Dit account heeft POSIX mogelijkheden uitgeschakeld. U kunt deze inschakelen "
  "door de knop hieronder te gebruiken."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -916,252 +920,243 @@ msgstr ""
  "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
  "moet u eerst het samba / omgevings account verwijderen."
  
-#: include/utils/class_msgPool.inc:410
-#, fuzzy, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
-"moet u eerst het samba / omgevings account verwijderen."
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, fuzzy, php-format
  msgid "Add %s settings"
  msgstr "Programma instellingen"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, fuzzy, php-format
  msgid "Remove %s settings"
  msgstr "Posix instellingen"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te "
  "veranderen"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Januari"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Februari"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Maart"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "April"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Mei"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Juni"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Juli"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Augustus"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "September"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Oktober"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "November"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "December"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Sunday"
  msgstr "Achternaam"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Monday"
  msgstr "maand"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "read operation"
  msgstr "E-mail opties"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "modify operation"
  msgstr "Persoonlijke informatie"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "delete operation"
  msgstr "Selecteer om werkstations te zien"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "search operation"
  msgstr "Het account verloopt op"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "authentication"
  msgstr "Nagios authenticatie"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, fuzzy, php-format
  msgid "LDAP %s failed!"
  msgstr "De database zoekopdracht is mislukt"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  #, fuzzy
  msgid "LDAP operation failed!"
  msgstr "De database zoekopdracht is mislukt"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  #, fuzzy
  msgid "Upload failed!"
  msgstr "Gebruikers inlog mislukt. De LDAP server meldt: '%s'."
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, fuzzy, php-format
  msgid "Upload failed: %s"
  msgstr "Log DB gebruiker"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, fuzzy, php-format
  msgid "This '%s' is still in use."
  msgstr "Deze 'dn' is geen groep."
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Kan bestand '%s' niet openen."
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Kan bestand '%s' niet openen."
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, fuzzy, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Kan bestand '%s' niet openen."
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, fuzzy, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Ga naar basis afdelingen"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, fuzzy, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Kan bestand '%s' niet openen."
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, fuzzy, php-format
  msgid "Checking for %s support"
  msgstr "Zoeken naar iconv ondersteuning"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  #, fuzzy
  msgid "Cannot not parse XML!"
  msgstr ""
  "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, fuzzy, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Kan bestand '%s' niet aanmaken."
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, fuzzy, php-format
  msgid "Cannot remove entry %s!"
  msgstr "Onbekende FAI status %s"
@@ -1279,20 +1274,20 @@ msgstr "Gebruiker"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Basis"
@@ -1306,47 +1301,47 @@ msgstr "Filter regels met deze syntax"
  msgid "Please fix the above error and reload the page."
  msgstr ""
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  #, fuzzy
  msgid "Fatal error"
  msgstr "Terminal server"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, 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:397
+#: include/functions.inc:398
  #, 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:466
+#: include/functions.inc:467
  #, 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:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1355,14 +1350,14 @@ msgstr ""
  "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u."
  "b. de 'config' regel in gosa.conf!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid "LDAP server returned: %s"
  msgstr "LDAP server"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1371,19 +1366,19 @@ msgstr "LDAP server"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Waarschuwing"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  #, fuzzy
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
@@ -1392,12 +1387,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:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1406,171 +1401,171 @@ msgstr ""
  "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
  "limiet nog steeds overschreden wordt."
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Instellen"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "onvolledig"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Toch doorgaan"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Alsnog bewerken"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, 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:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "Regels per pagina"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Filter toepassen"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "GOsa ontwikkelversie (Revisie %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  #, fuzzy
  msgid "Cannot write to revision file!"
  msgstr "Kan bestand '%s' niet aanmaken."
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "LDAP warning"
  msgstr "LDAP beheer"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, 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:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, fuzzy, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Toon FAI sjabloon objecten"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, fuzzy, php-format
  msgid "Class(es) available"
  msgstr "Bestand is beschikbaar"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Duits"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Frans"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Italiaans"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Spaans"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Engels"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Nederlands"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Pools"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  #, fuzzy
  msgid "Chinese"
  msgstr "Chipset"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  #, fuzzy
  msgid "Vietnamese"
  msgstr "Naam"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Russisch"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1578,7 +1573,7 @@ msgstr ""
  "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
  "bestaat niet."
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1640,7 +1635,7 @@ msgstr "Type"
  msgid "Arguments"
  msgstr "Argumenten"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1694,7 +1689,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr "U staat op het punt de macro '%s' te verwijderen."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr ""
  
@@ -1720,33 +1715,33 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Omschrijving"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1756,70 +1751,70 @@ msgstr ""
  msgid "Permission"
  msgstr "Rechten"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, fuzzy, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, fuzzy, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  #, fuzzy
  msgid "from"
  msgstr "willekeurig"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "to"
  msgstr "Stop"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  #, fuzzy
  msgid "Restore"
  msgstr "Opnieuw proberen"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Nagios account aanmaken"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Nieuw FAI object aanmaken"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "knippen"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Deze invoer knippen"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "kopieer"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Deze invoer kopieren"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  #, fuzzy
  msgid "Copy"
  msgstr "kopieer"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  #, fuzzy
  msgid "Cut"
  msgstr "knippen"
@@ -1839,7 +1834,7 @@ 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:49
+#: include/class_tabs.inc:51
  #, fuzzy, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
@@ -1848,12 +1843,12 @@ msgstr ""
  "Kan niet verbinden met de opgegeven database. Controleer uw GLPI "
  "configuratie a.u.b."
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, 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:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Referenties"
  
@@ -1886,12 +1881,12 @@ msgstr "Referenties"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1900,17 +1895,17 @@ msgstr "Referenties"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Naam"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Land"
  
@@ -1928,7 +1923,7 @@ msgstr "Land"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Administratieve instellingen"
@@ -1993,7 +1988,7 @@ msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "Windows beheerders"
@@ -2008,7 +2003,7 @@ msgstr "Naam van de aan te maken subtree"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Categorie"
@@ -2023,20 +2018,20 @@ msgstr "Categorie voor deze subtree"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Plaats"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Provincie"
@@ -2053,7 +2048,7 @@ msgstr "Plaats van deze subtree"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2069,13 +2064,13 @@ msgstr "Post adres van deze subtree"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2090,13 +2085,13 @@ msgstr "Basis telefoonnummer van deze subtree"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2108,8 +2103,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Basis Fax nummer van deze subtree"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Afdelingen"
  
@@ -2118,7 +2113,7 @@ msgstr "Afdelingen"
  msgid "Manage Departments"
  msgstr "Afdelingen"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2135,44 +2130,44 @@ msgstr "Afdelingen"
  msgid "Permission error"
  msgstr "Rechten"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "Plaats"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Organisatie"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2257,59 +2252,59 @@ msgstr ""
  "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
  "eenheid te markeren!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Markeren van '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Doorgaan"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Verplaatsen van %s naar %s"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Algemeen"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Afdelingnaam"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Telefoon"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Object '%s' is al gemarkeerd"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Toevoegen van markering (%s) aan object '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Verwijderen van markering van object '%s'"
@@ -2320,7 +2315,7 @@ msgid "Organization name"
  msgstr "Organisatie"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Adres thuis"
  
@@ -2339,9 +2334,9 @@ msgstr "Lijst met afdelingen"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  #, fuzzy
  msgid "Select all"
  msgstr "Selecteer"
@@ -2376,7 +2371,8 @@ msgstr "Verwerk afdeling"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Aanmaken"
  
@@ -2388,7 +2384,7 @@ msgstr "Aanmaken"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Verwijderen"
  
@@ -2453,7 +2449,7 @@ msgstr "Toon overeenkomende macro's"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Funktie"
@@ -2627,15 +2623,15 @@ msgid "Object group"
  msgstr "Objectgroep"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2719,8 +2715,7 @@ msgid "Regular expression for matching group names"
  msgstr "Reguliere expressie voor overeenkomende groepnamen"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2748,41 +2743,37 @@ msgstr ""
  "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
  "om te annuleren."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Telefoonwachtrij"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  #, fuzzy
  msgid "Systems"
  msgstr "Systeem"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Opstarten"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Apparaten"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "FAI samenvatting"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Omgeving"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Programma's"
  
@@ -2821,7 +2812,7 @@ msgstr "Reguliere expressie voor overeenkomende objectnamen"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Objectgroepen"
  
@@ -2843,45 +2834,45 @@ msgstr "PHP fout"
  msgid "object group"
  msgstr "Objectgroep"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Gebruiker"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Groep"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Programma"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Server"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Werkstation"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  #, fuzzy
  msgid "Windows Install"
  msgstr "Windows werkstation"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Printer"
@@ -2898,121 +2889,128 @@ msgstr "Informatie"
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "afdelingen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  #, fuzzy
  msgid "people"
  msgstr "Toon personen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "groepen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "servers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "werkstations"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "terminals"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  #, fuzzy
  msgid "printer"
  msgstr "printers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "printers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "telefoons"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "programma's"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "geen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "te veel verschillende object tpyes!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "gebruikers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  #, fuzzy
  msgid "winstations"
  msgstr "Windows werkstation"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "gedeactiveerd"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "volledige toegang"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "sta toegang op deze computers toe"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "Niet bestaande dn: "
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  #, 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:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  #, fuzzy
  msgid "Object group generic"
  msgstr "Objectgroep"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Systeem vertrouwen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  #, fuzzy
  msgid "Member"
  msgstr "Groepsleden"
@@ -3062,7 +3060,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3100,7 +3098,7 @@ msgstr "Gebruikersnaam"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Sjabloon"
@@ -3268,7 +3266,7 @@ msgid "Manage users"
  msgstr "Windows gebruikers"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3279,7 +3277,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3309,17 +3307,17 @@ msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
  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:656
+#: plugins/admin/users/class_userManagement.inc:652
  #, fuzzy
  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:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Naam"
  
@@ -3363,10 +3361,10 @@ msgstr "Voornaam"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Inlognaam"
  
@@ -3824,13 +3822,13 @@ msgid "POSIX account"
  msgstr "GLPI account"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Mijn account"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "Gebruikers ID"
  
@@ -3874,7 +3872,7 @@ msgstr "Toon personen"
  msgid "System trust model"
  msgstr "Systeem vertrouwen"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  #, fuzzy
  msgid "POSIX settings"
  msgstr "Posix instellingen"
@@ -3922,18 +3920,18 @@ msgid "Template name"
  msgstr "Sjabloon naam"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Aanhef"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Academische titel"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Geboortedatum"
  
@@ -3957,9 +3955,9 @@ msgid "Private phone"
  msgstr "Telefoon privé"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Homepage"
@@ -4001,7 +3999,7 @@ msgid "Employee No."
  msgstr "Personeel nr."
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Functie"
@@ -4014,69 +4012,69 @@ msgid "Room No."
  msgstr "Kamer nr."
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "GSM"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Pieper"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Beroep"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Eenheid omschrijving"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Werkgebied"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Functionele titel"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Werkplaats"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Eenheid"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Straat"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Postcode"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Huis identificatie"
@@ -4086,13 +4084,13 @@ msgid "Please use the phone tab"
  msgstr "Gebruik a.u.b. de telefoon tab"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Laatste levering"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Publiek zichtbaar"
@@ -4103,7 +4101,7 @@ msgstr "Gebruikersinstellingen"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -4118,7 +4116,7 @@ msgid "Set new password"
  msgstr "Nieuw wachtwoord instellen"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Persoonlijk plaatje"
  
@@ -4172,115 +4170,115 @@ msgstr "ongeldig"
  msgid "No certificate installed"
  msgstr "Geen certificaat geinstalleerd"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  #, fuzzy
  msgid "Password method"
  msgstr "Wachtwoord encryptie"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  #, fuzzy
  msgid "The selected password method is no longer available."
  msgstr "Dit programma is niet meer beschikbaar."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  #, fuzzy
  msgid "The selected password method requires initial configuration!"
  msgstr "Dit programma is niet meer beschikbaar."
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  #, fuzzy
  msgid "Cannot open certificate!"
  msgstr "Het opgegeven certificaat kon geopend worden!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Certificaat serienummer"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Algemene wachtrij instellingen"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Achternaam"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  #, fuzzy
  msgid "User identification"
  msgstr "Gebruikersinformatie"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  #, fuzzy
  msgid "Gender"
  msgstr "Afzender"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  #, fuzzy
  msgid "Preferred language"
  msgstr "Voorkeurstaal"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  #, fuzzy
  msgid "Department number"
  msgstr "Afdelingnaam"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  #, fuzzy
  msgid "Employee number"
  msgstr "Functie"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  #, fuzzy
  msgid "Room number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  #, fuzzy
  msgid "Telefon number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  #, fuzzy
  msgid "Pager number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  #, fuzzy
  msgid "Mobile number"
  msgstr "GSM nummer"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  #, fuzzy
  msgid "Fax number"
  msgstr "Serienummer"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Adres thuis"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  #, fuzzy
  msgid "Home phone number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "Wachtwoord encryptie"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  #, fuzzy
  msgid "User certificates"
  msgstr "Standaard certificaat"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  #, fuzzy
  msgid "You have no permission to set your password!"
  msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Algemene gebruikersinformatie"
  
@@ -4374,7 +4372,7 @@ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
  msgid "User password"
  msgstr "Wachtwoord wissen"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  #, fuzzy
  msgid "Password settings"
  msgstr "Gebruikersinstellingen"
@@ -5257,7 +5255,7 @@ msgstr ""
  msgid "Completed"
  msgstr "onvolledig"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  #, fuzzy
  msgid "Next"
  msgstr "tekst"
@@ -5535,286 +5533,301 @@ msgstr "gedeactiveerd"
  msgid "Enabled"
  msgstr "gedeactiveerd"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  #, fuzzy
  msgid "LDAP inspection"
  msgstr "PHP configuratie inspectie"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  #, fuzzy
  msgid "Checking for root object"
  msgstr "Zoeken naar iconv ondersteuning"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  #, fuzzy
  msgid "Checking for invisible departments"
  msgstr "Zoeken naar iconv ondersteuning"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  #, fuzzy
  msgid "Checking for invisible users"
  msgstr "Zoeken naar iconv ondersteuning"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  #, fuzzy
  msgid "Checking for super administrator"
  msgstr "Zoeken naar enkele additionele programma's"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  #, fuzzy
  msgid "Checking for users outside the people tree"
  msgstr "Zoeken naar CUPS module"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  #, fuzzy
  msgid "Checking for groups outside the groups tree"
  msgstr "Zoeken naar CUPS module"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  #, fuzzy
  msgid "Checking for duplicated UID numbers"
  msgstr "Zoeken naar functie %s"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  #, fuzzy
  msgid "Checking for duplicate GID numbers"
  msgstr "Zoeken naar functie %s"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "Zoeken naar iconv ondersteuning"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "Zoeken naar CUPS module"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "Zoeken naar functie %s"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  #, fuzzy
  msgid "LDAP query failed"
  msgstr "De database zoekopdracht is mislukt"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, 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:299
+#: setup/class_setupStep_Migrate.inc:305
  #, 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:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Mislukt"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  #, fuzzy
  msgid "Migrate"
  msgstr "Aanmaken"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, 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:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  #, fuzzy
  msgid "Move"
  msgstr "Modus"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  #, fuzzy
  msgid "Migration error"
  msgstr "Aanmaken"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, fuzzy, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Ga naar basis afdelingen"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Netatalk account aanmaken"
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Input error"
  msgstr "PHP fout"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Password error"
  msgstr "Wachtwoord verloopt op"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, 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:1057
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Specify a valid user ID!"
  msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  #, fuzzy
  msgid "Cannot move users to the requested department!"
  msgstr "Ga naar de afdeling van de gebruiker"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  #, fuzzy
  msgid "Try to create root object"
  msgstr "Nieuw FAI object aanmaken"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, fuzzy, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Verplaatsen van %s naar %s"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Log DB gebruiker"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -6024,17 +6037,17 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  #, fuzzy
  msgid "Hide changes"
  msgstr "Open-Xchange"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  #, fuzzy
  msgid "Show changes"
  msgstr "Toon pakketten"
@@ -6061,84 +6074,100 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Maak gebruiker aan met dit sjabloon"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Netatalk account aanmaken"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+#, fuzzy
+msgid "Current"
+msgstr "Nieuw FAI object aanmaken"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+#, fuzzy
+msgid "After migration"
+msgstr "Gebruikersbeheer"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+#, fuzzy
+msgid "Reload"
+msgstr "Lezen"
+
+#: setup/setup_migrate.tpl:245
  #, fuzzy
  msgid "Abort"
  msgstr "Poort"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  #, fuzzy
  msgid "Create a new GOsa administrator account"
  msgstr "Netatalk account aanmaken"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  #, fuzzy
  msgid "Password (again)"
  msgstr "Wachtwoord encryptie"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-#, fuzzy
-msgid "Current"
-msgstr "Nieuw FAI object aanmaken"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-#, fuzzy
-msgid "After migration"
-msgstr "Gebruikersbeheer"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "Referenties"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6321,11 +6350,6 @@ msgstr "Verbindingings URL"
  msgid "TLS connection"
  msgstr "Bel..."
  
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "Lezen"
-
  #: setup/setup_ldap.tpl:69
  #, fuzzy
  msgid "Authentication"
@@ -6700,7 +6724,7 @@ msgstr ""
  "webbrowser afgesloten tijdens de bewerking. U kunt de blokkade in dit geval "
  "overnemen door de <i>Alsnog bewerken</i> knop te gebruiken."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  #, fuzzy
  msgid "Read only"
  msgstr "Lijst herladen"
@@ -6716,6 +6740,18 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Aanmaken"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
+#~ "moet u eerst het samba / omgevings account verwijderen."
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po

index ea0a0db97aeeaac86e951faa00d0e86552d60a39..1f45e9eb4df7d063bddfccd5dc18fbe8bb273c0f 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\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"
@@ -34,24 +34,24 @@ msgstr "Kreator Copy &amp; paste"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -69,12 +69,12 @@ msgstr "Nie można stworzyć pliku '%s'."
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -90,10 +90,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  #, fuzzy
  msgid "Internal error"
  msgstr "Terminal Server"
@@ -113,8 +113,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Wklej"
  
@@ -162,12 +162,14 @@ msgid "Use ACL defined in role"
  msgstr "Użyj ACL zdefiniowanego w tej roli"
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Użytkownicy"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Grupy"
  
@@ -192,7 +194,7 @@ msgstr "Edytuj"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -236,8 +238,8 @@ msgstr "Wszystkie obiekty w obecnym poddrzewie"
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -316,44 +318,43 @@ msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  #, fuzzy
  msgid "LDAP error"
  msgstr "błąd LDAP:"
@@ -458,17 +459,17 @@ 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:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  #, fuzzy
  msgid "Configuration"
  msgstr "Plik konfiguracyjny"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -765,15 +766,16 @@ msgstr "Rozszerzenie inwentarza"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -781,15 +783,16 @@ msgid "Cancel"
  msgstr "Anuluj"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -800,12 +803,13 @@ msgid "Ok"
  msgstr "Ok"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Zastosuj"
@@ -816,7 +820,7 @@ msgstr "Zastosuj"
  msgid "Save"
  msgstr "Zapisz"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Dodaj"
@@ -857,19 +861,19 @@ msgstr "Edytuj użytkownika"
  msgid "Back"
  msgstr "Wróć"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, fuzzy, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "To konto nie posiada poprawnych rozszerzeń GOsa."
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
  msgstr ""
  "To konto posiada rozszerzenia posix. Można je wyłączyć klikająć poniżej."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -878,14 +882,14 @@ msgstr ""
  "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
  "konto Samba/Środowisko."
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
  msgstr ""
  "To konto nie posiada rozszerzenia posix. Można je włączyć klikająć poniżej."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -894,250 +898,241 @@ msgstr ""
  "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
  "konto Samba/Środowisko."
  
-#: include/utils/class_msgPool.inc:410
-#, fuzzy, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
-"konto Samba/Środowisko."
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, fuzzy, php-format
  msgid "Add %s settings"
  msgstr "Ustawienia Aplikacji"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, fuzzy, php-format
  msgid "Remove %s settings"
  msgstr "Ustawienia Posix"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Styczeń"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Luty"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Marzec"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Kwiecień"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Maj"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Czerwiec"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Lipiec"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Sierpień"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Wrzesień"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Październik"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Listopad"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Grudzień"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Sunday"
  msgstr "Nazwisko"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Monday"
  msgstr "miesiąc"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Wednesday"
  msgstr "Środa"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "read operation"
  msgstr "Opcje poczty"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "modify operation"
  msgstr "Informacje osobiste"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "delete operation"
  msgstr "Wybierz aby zobaczyc stacje robocze"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "search operation"
  msgstr "Konto wygasa po"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "authentication"
  msgstr "Autentykacja Nagios"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, fuzzy, php-format
  msgid "LDAP %s failed!"
  msgstr "Zapytanie do bazy danych nieudane"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  #, fuzzy
  msgid "LDAP operation failed!"
  msgstr "Zapytanie do bazy danych nieudane"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  #, fuzzy
  msgid "Upload failed!"
  msgstr "Logowanie użytkownika nieudane, odpowiedź serwera LDAP '%s'."
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, fuzzy, php-format
  msgid "Upload failed: %s"
  msgstr "Użytkownik bazy logowania"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, fuzzy, php-format
  msgid "This '%s' is still in use."
  msgstr "Zawiera ustawienia dla tych obiektów: %s"
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, 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:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Nie można otworzyć pliku '%s'."
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Nie można otworzyć pliku '%s'."
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, fuzzy, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Nie można otworzyć pliku '%s'."
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, fuzzy, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Utwórz nowy departament"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, fuzzy, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Nie można otworzyć pliku '%s'."
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, fuzzy, php-format
  msgid "Checking for %s support"
  msgstr "Sprawdzam wsparcie dla iconv"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  #, fuzzy
  msgid "Cannot not parse XML!"
  msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, fuzzy, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Nie można stworzyć pliku '%s'."
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, fuzzy, php-format
  msgid "Cannot remove entry %s!"
  msgstr "Nieznany wpis  '%s'!"
@@ -1255,20 +1250,20 @@ msgstr "Użytkownik"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Kontener"
@@ -1282,46 +1277,46 @@ msgstr "Filtruj elementy z tą składnią"
  msgid "Please fix the above error and reload the page."
  msgstr ""
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  #, fuzzy
  msgid "Fatal error"
  msgstr "Terminal Server"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, 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:397
+#: include/functions.inc:398
  #, 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:466
+#: include/functions.inc:467
  #, 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:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1330,14 +1325,14 @@ msgstr ""
  "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
  "'config' w gosa.conf!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid "LDAP server returned: %s"
  msgstr "Serwer LDAP"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1346,19 +1341,19 @@ msgstr "Serwer LDAP"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Ostrzeżenie"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  #, fuzzy
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
@@ -1367,12 +1362,12 @@ msgstr ""
  "Znaleziono wiele blokad dla obiektu do zablokowania. Taka sytuacja nie "
  "powinna się wydażyć - czyszczę wiele odwołań."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "Limit wielkości %d elementów został przekroczony!"
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1381,177 +1376,177 @@ msgstr ""
  "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
  "przekroczony"
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Konfiguruj"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "niepełne"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Kontynuuj mimo wszystko"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Edytuj mimo wszystko"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, fuzzy, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "Zamierzasz skopiować wpis '%s'."
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "Wpisów na stronie"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Zastosuj filtr"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Wersja deweloperska GOsa (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  #, fuzzy
  msgid "Cannot write to revision file!"
  msgstr "Nie można stworzyć pliku '%s'."
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "LDAP warning"
  msgstr "Menedżer LDAP"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, 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:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, fuzzy, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Wyświetl szablony FAI"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, fuzzy, php-format
  msgid "Class(es) available"
  msgstr "Plik jest dostępny"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Niemiecki"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Francuski"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Włoski"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Hiszpański"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Angielski"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Holenderski"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Polski"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  #, fuzzy
  msgid "Chinese"
  msgstr "Chipset"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  #, fuzzy
  msgid "Vietnamese"
  msgstr "Imię"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Rosyjski"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, 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:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1612,7 +1607,7 @@ msgstr "Typ"
  msgid "Arguments"
  msgstr "Argumenty"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1666,7 +1661,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Zamierzasz usunąć snapshot '%s'."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr "Odtwórz snapshot"
  
@@ -1691,25 +1686,25 @@ msgstr "Y-m-d, H:i:s"
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Opis"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, fuzzy, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1718,8 +1713,8 @@ msgstr ""
  "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
  "skonfigurowana w gosa.conf."
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1729,67 +1724,67 @@ msgstr ""
  msgid "Permission"
  msgstr "Uprawnienia"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, fuzzy, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "Brak uprawnień do zmiany przekazywania poczty"
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, fuzzy, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Brak uprawnień do zmiany przekazywania poczty"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  #, fuzzy
  msgid "from"
  msgstr "losowy"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "to"
  msgstr "Zatrzymaj"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr "Odtwórz"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr "Utwórz spanshot"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr "Utwórz nowy snapshot z tego obiektu"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "wytnij"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Wytnij ten obiekt"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "kopiuj"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Kopiuj ten obiekt"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  #, fuzzy
  msgid "Copy"
  msgstr "kopiuj"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  #, fuzzy
  msgid "Cut"
  msgstr "wytnij"
@@ -1809,7 +1804,7 @@ 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:49
+#: include/class_tabs.inc:51
  #, fuzzy, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
@@ -1818,12 +1813,12 @@ msgstr ""
  "OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
  "parametry konfiguracji."
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, 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:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Zależności"
  
@@ -1856,12 +1851,12 @@ msgstr "Zależności"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1870,17 +1865,17 @@ msgstr "Zależności"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Imię"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Kraj"
  
@@ -1898,7 +1893,7 @@ msgstr "Kraj"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Ustawienia administracyjne"
@@ -1963,7 +1958,7 @@ msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "Administratorzy domeny"
@@ -1978,7 +1973,7 @@ msgstr "Nazwa tworzonego poddrzewa"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Kategoria"
@@ -1993,20 +1988,20 @@ msgstr "Kategoria dla tego poddrzewa"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Lokalizacja"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Stan"
@@ -2023,7 +2018,7 @@ msgstr "Lokalizacja tego poddrzewa"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2039,13 +2034,13 @@ msgstr "Kod pocztowy tego poddrzewa"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2060,13 +2055,13 @@ msgstr "Bazowy numer telefonu tego poddrzewa"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2078,8 +2073,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Bazowy numer faxu tego poddrzewa"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Departamenty"
  
@@ -2088,7 +2083,7 @@ msgstr "Departamenty"
  msgid "Manage Departments"
  msgstr "Departamenty"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2105,44 +2100,44 @@ msgstr "Departamenty"
  msgid "Permission error"
  msgstr "Uprawnienia"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "Lokalizacja"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Organizacja"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2225,59 +2220,59 @@ msgstr ""
  "Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
  "administracyjnej!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Zaznaczanie '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Kontynuuj"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Przenoszenie '%s' do '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "BŁĄD kopiowania %s, anulowanie operacji"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Ogólne"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Nazwa departamentu"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Telefon"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Obiekt '%s' jest już zaznaczony"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Usuwanie znacznika z obiektu '%s'"
@@ -2288,7 +2283,7 @@ msgid "Organization name"
  msgstr "Organizacja"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Adres pocztowy"
  
@@ -2307,9 +2302,9 @@ msgstr "Lista departamentów"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  #, fuzzy
  msgid "Select all"
  msgstr "Wybierz"
@@ -2344,7 +2339,8 @@ msgstr "Zatwierdź departament"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Utwórz"
  
@@ -2356,7 +2352,7 @@ msgstr "Utwórz"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Usuń"
  
@@ -2419,7 +2415,7 @@ msgstr "Wyświetl ACL pasujące"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Pełniona funkcja"
@@ -2588,15 +2584,15 @@ msgid "Object group"
  msgstr "Grupa obiektu"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2680,8 +2676,7 @@ msgid "Regular expression for matching group names"
  msgstr "Wyrażenie regularne dla dopasowania nazw grup"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2707,41 +2702,37 @@ msgstr ""
  "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
  "anulować."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Kolejka telefoniczna"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  #, fuzzy
  msgid "Systems"
  msgstr "System"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Startup"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Urządzenia"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "Podsumowanie FAI"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Środowisko"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Aplikacje"
  
@@ -2780,7 +2771,7 @@ msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Grupy obiektów"
  
@@ -2802,45 +2793,45 @@ msgstr "błąd PHP:"
  msgid "object group"
  msgstr "Grupa obiektu"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Użytkownik"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Grupa"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Aplikacja"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Serwer"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Stacja robocza"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  #, fuzzy
  msgid "Windows Install"
  msgstr "Stacja robocza Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Drukarka"
@@ -2857,120 +2848,127 @@ msgstr "Informacja"
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "departamenty"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  #, fuzzy
  msgid "people"
  msgstr "Pokaż ludzi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "grupy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "serwery"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "stacje robocze"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "terminale"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  #, fuzzy
  msgid "printer"
  msgstr "drukarki"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "drukarki"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "telefony"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "aplikacje"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "żaden"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "za dużo różnych obiektów!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "użytkownicy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  #, fuzzy
  msgid "winstations"
  msgstr "Stacja Windows"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "wyłączone"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "pełen dostęp"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "zezwól na dostęp do tych hostów"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "Nieistniejące dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  #, 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:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr "Podstawowa grupa obiektu"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Zaufanie systemowe"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr "Członek"
  
@@ -3019,7 +3017,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3057,7 +3055,7 @@ msgstr "Nazwa użytkownika"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Szablon"
@@ -3225,7 +3223,7 @@ msgid "Manage users"
  msgstr "Użytkownicy domeny"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3234,7 +3232,7 @@ msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentycz
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3264,17 +3262,17 @@ msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  msgid "You have no permission to use this template!"
  msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  #, fuzzy
  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:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Imię"
  
@@ -3318,10 +3316,10 @@ msgstr "Imię"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Login"
  
@@ -3764,13 +3762,13 @@ msgid "POSIX account"
  msgstr "Konto POSIX"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Moje konto "
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "Identyfikator użytkownika"
  
@@ -3806,7 +3804,7 @@ msgstr "Shadow wygasa"
  msgid "System trust model"
  msgstr "Zaufanie do systemów"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  #, fuzzy
  msgid "POSIX settings"
  msgstr "Ustawienia Posix"
@@ -3853,18 +3851,18 @@ msgid "Template name"
  msgstr "Nazwa Szablonu"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Osobisty tytuł"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Tytuł naukowy"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Data urodzenia"
  
@@ -3888,9 +3886,9 @@ msgid "Private phone"
  msgstr "Telefon prywatny"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Strona domowa"
@@ -3932,7 +3930,7 @@ msgid "Employee No."
  msgstr "Numer pracownika"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Typ pracownika"
@@ -3945,69 +3943,69 @@ msgid "Room No."
  msgstr "Numer pokoju"
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Komórka"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Pager"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Wywołanie"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Opis jednostki"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Sektor"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Tytuł funkcjonalny"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Lokalizacja osoby"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Jednostka"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Ulica"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Kod pocztowy"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Identyfikator budynku"
@@ -4017,13 +4015,13 @@ msgid "Please use the phone tab"
  msgstr "Proszę użyć zakładki telefony"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Ostatnia dostawa"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Publicznie widoczne"
@@ -4034,7 +4032,7 @@ msgstr "Ustawienia użytkownika"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -4049,7 +4047,7 @@ msgid "Set new password"
  msgstr "Ustaw nowe hasło"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Zdjęcie użytkownika"
  
@@ -4103,102 +4101,102 @@ msgstr "nieprawidłowy"
  msgid "No certificate installed"
  msgstr "Brak zainstalowanych certyfikatów"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  #, fuzzy
  msgid "Password method"
  msgstr "Przechowywanie hasła"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  #, fuzzy
  msgid "The selected password method is no longer available."
  msgstr "Ta aplikacja nie jest już dostępna."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  #, fuzzy
  msgid "The selected password method requires initial configuration!"
  msgstr "Ta aplikacja nie jest już dostępna."
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  #, fuzzy
  msgid "Cannot open certificate!"
  msgstr "Nie można otworzyć wybranego certyfikatu!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Nmer seryjny certyfikatu"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr "Ogólne ustawienia użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "Nazwisko"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr "Identyfikacja użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr "Płeć"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr "Preferowany język"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr "Numer departamentu"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr "Numer pracownika"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr "Numer pokoju"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr "Numer telefonu"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr "Numer pagera"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr "Telefon komórkowy"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr "Numer fax"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Adres domowy"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr "Numer telefonu domowego"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "Przechowywanie hasła"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr "Certyfikaty użytkownika"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  #, fuzzy
  msgid "You have no permission to set your password!"
  msgstr "Brak uprawnień do zmiany własnego hasła"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Ogólne informacje o użytkowniku"
  
@@ -4288,7 +4286,7 @@ msgstr "Brak uprawnień do zmiany własnego hasła"
  msgid "User password"
  msgstr "Hasło użytkownika"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  #, fuzzy
  msgid "Password settings"
  msgstr "Ustawienia użytkownika"
@@ -5158,7 +5156,7 @@ msgstr ""
  msgid "Completed"
  msgstr "niepełne"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  #, fuzzy
  msgid "Next"
  msgstr "tekst"
@@ -5437,286 +5435,301 @@ msgstr "wyłączone"
  msgid "Enabled"
  msgstr "włączone"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  #, fuzzy
  msgid "LDAP inspection"
  msgstr "Inspekcja instalacji PHP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  #, fuzzy
  msgid "Checking for root object"
  msgstr "Sprawdzam wsparcie dla iconv"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  #, fuzzy
  msgid "Checking for invisible departments"
  msgstr "Sprawdzam wsparcie dla iconv"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  #, fuzzy
  msgid "Checking for invisible users"
  msgstr "Sprawdzam wsparcie dla iconv"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  #, fuzzy
  msgid "Checking for super administrator"
  msgstr "Sprawedzam dodatkowe programy"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  #, fuzzy
  msgid "Checking for users outside the people tree"
  msgstr "Sprawdzam moduł cups"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  #, fuzzy
  msgid "Checking for groups outside the groups tree"
  msgstr "Sprawdzam moduł cups"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  #, fuzzy
  msgid "Checking for duplicated UID numbers"
  msgstr "Sprawdzam funkcję %s"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  #, fuzzy
  msgid "Checking for duplicate GID numbers"
  msgstr "Sprawdzam funkcję %s"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "Sprawdzam wsparcie dla iconv"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "Sprawdzam moduł cups"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "Sprawdzam funkcję %s"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  #, fuzzy
  msgid "LDAP query failed"
  msgstr "Zapytanie do bazy danych nieudane"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, 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:299
+#: setup/class_setupStep_Migrate.inc:305
  #, 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:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Niepowodzenie"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  #, fuzzy
  msgid "Migrate"
  msgstr "Utwórz"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, fuzzy, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr "Zamierzasz skopiować wpis '%s'."
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  #, fuzzy
  msgid "Move"
  msgstr "Tryb"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  #, fuzzy
  msgid "Migration error"
  msgstr "Utwórz"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, fuzzy, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Utwórz nowy departament"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Utwórz konto Netatalk"
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Input error"
  msgstr "błąd PHP:"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Password error"
  msgstr "Hasło wygasa"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Provided passwords do not match!"
  msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Specify a valid user ID!"
  msgstr "Proszę podać prawidłową nazwę użytkownika!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  #, fuzzy
  msgid "Cannot move users to the requested department!"
  msgstr "Przejdź do domowego departamentu użytkowników"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  #, fuzzy
  msgid "Group will be moved from"
  msgstr "Będzie możliwość odtworzenia z"
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "User will be moved from"
  msgstr "Użyj członków z"
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  #, fuzzy
  msgid "Try to create root object"
  msgstr "Utwórz obiekty"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, fuzzy, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Przenoszenie '%s' do '%s'"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Użytkownik bazy logowania"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -5925,17 +5938,17 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  #, fuzzy
  msgid "Hide changes"
  msgstr "Open xchange"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  #, fuzzy
  msgid "Show changes"
  msgstr "Pokaż pakiety"
@@ -5962,84 +5975,100 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Utwórz użytkownika z tego szablonu"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Utwórz konto Netatalk"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+#, fuzzy
+msgid "Current"
+msgstr "Obecny obiekt"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+#, fuzzy
+msgid "After migration"
+msgstr "Administracja użytkownikami"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+#, fuzzy
+msgid "Reload"
+msgstr "Odczyt"
+
+#: setup/setup_migrate.tpl:245
  #, fuzzy
  msgid "Abort"
  msgstr "Port"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  #, fuzzy
  msgid "Create a new GOsa administrator account"
  msgstr "Utwórz konto Netatalk"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  #, fuzzy
  msgid "Password (again)"
  msgstr "Przechowywanie hasła"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-#, fuzzy
-msgid "Current"
-msgstr "Obecny obiekt"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-#, fuzzy
-msgid "After migration"
-msgstr "Administracja użytkownikami"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "Zależności"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6222,11 +6251,6 @@ msgstr "Połączeniowy URL"
  msgid "TLS connection"
  msgstr "Połączenie dzwonienia..."
  
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "Odczyt"
-
  #: setup/setup_ldap.tpl:69
  #, fuzzy
  msgid "Authentication"
@@ -6595,7 +6619,7 @@ msgstr ""
  "okno przeglądarki podczas operacji edycji. Można przejąć blokadę naciskając "
  "Edytuj."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  #, fuzzy
  msgid "Read only"
  msgstr "Przeładuj listę"
@@ -6611,6 +6635,18 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Utwórz"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw "
+#~ "usunąć konto Samba/Środowisko."
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po

index 2c1b142c75239960bb5e211fcc0e605947de301e..fbf6a473ce0d122af1e4f289b98f398a83fceb26 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\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"
@@ -34,24 +34,24 @@ msgstr "Ошибка при регистрации. Ответ сервера: \
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -69,12 +69,12 @@ msgstr "Удалить"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -90,10 +90,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  #, fuzzy
  msgid "Internal error"
  msgstr "Терминал-сервер"
@@ -113,8 +113,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  #, fuzzy
  msgid "Paste"
  msgstr "Дата"
@@ -168,12 +168,14 @@ msgid "Use ACL defined in role"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Пользователи"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Группы"
  
@@ -199,7 +201,7 @@ msgstr "Изменить"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -243,8 +245,8 @@ msgstr ""
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -326,44 +328,43 @@ msgstr ""
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  #, fuzzy
  msgid "LDAP error"
  msgstr "Ошибка LDAP:"
@@ -470,17 +471,17 @@ msgstr ""
  "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
  "администратору."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  #, fuzzy
  msgid "Configuration"
  msgstr "Настроить"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -780,15 +781,16 @@ msgstr "Удалить параметры"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -796,15 +798,16 @@ msgid "Cancel"
  msgstr "Отмена"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -815,12 +818,13 @@ msgid "Ok"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Применить"
@@ -831,7 +835,7 @@ msgstr "Применить"
  msgid "Save"
  msgstr "Сохранить"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Добавить"
@@ -872,12 +876,12 @@ msgstr "Пользователи домена"
  msgid "Back"
  msgstr "Назад"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, fuzzy, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Для этой учетной записи нет корректных расширений GOsa."
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
@@ -885,7 +889,7 @@ msgstr ""
  "В этой учетной записи используются атрибуты POSIX. Вы можете отключить их "
  "использование, щелкнув ниже."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -894,7 +898,7 @@ msgstr ""
  "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
  "использование, сначала нужно удалить учетную запись Samba."
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
@@ -902,7 +906,7 @@ msgstr ""
  "В этой учетной записи не используются атрибуты POSIX. Вы можете использовать "
  "их, щелкнув ниже."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -911,249 +915,240 @@ msgstr ""
  "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
  "использование, сначала нужно удалить учетную запись Samba."
  
-#: include/utils/class_msgPool.inc:410
-#, fuzzy, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
-"использование, сначала нужно удалить учетную запись Samba."
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, fuzzy, php-format
  msgid "Add %s settings"
  msgstr "Дополнительные записи в fstab"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, fuzzy, php-format
  msgid "Remove %s settings"
  msgstr "Атрибуты UNIX"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Январь"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Февраль"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Март"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Апрель"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Май"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Июнь"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Июль"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Август"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Сентябрь"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Октябрь"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Ноябрь"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Декабрь"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Sunday"
  msgstr "Имя сервера"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Monday"
  msgstr "месяц"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "read operation"
  msgstr "Почтовые настройки"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "modify operation"
  msgstr "Личная информация"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "delete operation"
  msgstr "Выберите чтобы посмотреть рабочие станции"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "search operation"
  msgstr "Учетная запись"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "authentication"
  msgstr "Рабочая станция Windows"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, fuzzy, php-format
  msgid "LDAP %s failed!"
  msgstr "Невозможно выполнить запрос к базе данных!"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  #, fuzzy
  msgid "LDAP operation failed!"
  msgstr "Невозможно выполнить запрос к базе данных!"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  #, fuzzy
  msgid "Upload failed!"
  msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, fuzzy, php-format
  msgid "Upload failed: %s"
  msgstr "Служба печати"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, fuzzy, php-format
  msgid "This '%s' is still in use."
  msgstr "Описание группы"
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, fuzzy, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "Описание группы"
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Удалить"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Удалить"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, fuzzy, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Удалить"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, fuzzy, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Список подразделений"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, fuzzy, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Удалить"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, fuzzy, php-format
  msgid "Checking for %s support"
  msgstr "Проверка поддержки gettext"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  #, fuzzy
  msgid "Cannot not parse XML!"
  msgstr "Слишком много пользователей, невозможно создать идентификатор!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, fuzzy, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Удалить"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, fuzzy, php-format
  msgid "Cannot remove entry %s!"
  msgstr "состояние неизвестно"
@@ -1277,20 +1272,20 @@ msgstr "Пользователь"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Ветка"
@@ -1304,36 +1299,36 @@ msgstr "Показать подходяшие адреса"
  msgid "Please fix the above error and reload the page."
  msgstr ""
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  #, fuzzy
  msgid "Fatal error"
  msgstr "Терминал-сервер"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, fuzzy, php-format
  msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
  msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  #, fuzzy
  msgid "Username / UID is not unique inside the LDAP tree!"
  msgstr ""
  "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  #, fuzzy
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1341,11 +1336,11 @@ msgid ""
  msgstr ""
  "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1354,14 +1349,14 @@ msgstr ""
  "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
  "\" в файле gosa.conf!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid "LDAP server returned: %s"
  msgstr "LDAP-сервер"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1370,19 +1365,19 @@ msgstr "LDAP-сервер"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Предупреждение"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  #, fuzzy
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
@@ -1391,12 +1386,12 @@ msgstr ""
  "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
  "должно, проверьте работу LDAP."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "Найдено более %d объектов."
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1405,179 +1400,179 @@ msgstr ""
  "Установить новое значение лимита в %s и показать мне это сообщение если "
  "лимит будет исчерпан."
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Настроить"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "не полный"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  #, fuzzy
  msgid "Continue anyway"
  msgstr "Продолжить"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  #, fuzzy
  msgid "Edit anyway"
  msgstr "Редактиовать объект"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, fuzzy, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "Вы собираетесь удалить объект %s."
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr ""
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  #, fuzzy
  msgid "Cannot write to revision file!"
  msgstr "Удалить"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr ""
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "LDAP warning"
  msgstr "Экспорт в LDIF"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, fuzzy, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Список подразделений"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr ""
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Немецкий"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Французский"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr ""
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Испанский"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Английский"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Датский"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  #, fuzzy
  msgid "Polish"
  msgstr "Английский"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  #, fuzzy
  msgid "Chinese"
  msgstr "сброс"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  #, fuzzy
  msgid "Vietnamese"
  msgstr "Имя"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Русский"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, fuzzy, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr ""
  "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1646,7 +1641,7 @@ msgstr "Тип"
  msgid "Arguments"
  msgstr "подразделения"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1701,7 +1696,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Вы собираетесь удалить группу \"%s\"."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr ""
  
@@ -1727,33 +1722,33 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Описание"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1763,73 +1758,73 @@ msgstr ""
  msgid "Permission"
  msgstr "Права для членов группы"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, fuzzy, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "Вам не разрешено менять пароль."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, fuzzy, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Вам не разрешено менять пароль."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  #, fuzzy
  msgid "from"
  msgstr "и"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "to"
  msgstr "Отношение"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  #, fuzzy
  msgid "Restore"
  msgstr "Повторить"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Создать настройки запись эл. почты"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Объект группы"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  #, fuzzy
  msgid "cut"
  msgstr "Выполнить"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Редактиовать объект"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr ""
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Редактиовать объект"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  #, fuzzy
  msgid "Copy"
  msgstr "Компания"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  #, fuzzy
  msgid "Cut"
  msgstr "Выполнить"
@@ -1849,19 +1844,19 @@ msgstr "Срок действия пароля истекает"
  msgid "The user password was resetted, please set a new password value!"
  msgstr "У вас недостаточно прав для смены своего пароля."
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, fuzzy, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
  "configuration file."
  msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr ""
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Ссылки"
  
@@ -1894,12 +1889,12 @@ msgstr "Ссылки"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1908,17 +1903,17 @@ msgstr "Ссылки"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Фамилия"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Страна"
  
@@ -1936,7 +1931,7 @@ msgstr "Страна"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  #, fuzzy
  msgid "Administrative settings"
@@ -2003,7 +1998,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "Администраторы домена"
@@ -2018,7 +2013,7 @@ msgstr "Имя создаваемой ветки"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Категория"
@@ -2033,20 +2028,20 @@ msgstr "Категория этой ветки"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Местоположение"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Адм. единица"
@@ -2063,7 +2058,7 @@ msgstr "Местоположение ветки"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2079,13 +2074,13 @@ msgstr "Почтовый адрес для ветки"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2100,13 +2095,13 @@ msgstr "Основный телефонный номер для ветки"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2118,8 +2113,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Основный номер факса для ветки"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Подразделения"
  
@@ -2128,7 +2123,7 @@ msgstr "Подразделения"
  msgid "Manage Departments"
  msgstr "Подразделения"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2145,44 +2140,44 @@ msgstr "Подразделения"
  msgid "Permission error"
  msgstr "Права для членов группы"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "Местоположение"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Организация"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2264,60 +2259,60 @@ msgstr ""
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Продолжить"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Общее"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  #, fuzzy
  msgid "Department name"
  msgstr "Управление подразделениями"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Телефон"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
@@ -2328,7 +2323,7 @@ msgid "Organization name"
  msgstr "Организация"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  #, fuzzy
  msgid "Postal address"
  msgstr "Почтовый индекс"
@@ -2349,9 +2344,9 @@ msgstr "Список подразделений"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  #, fuzzy
  msgid "Select all"
  msgstr "Удалить"
@@ -2387,7 +2382,8 @@ msgstr "Показать подразделения"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Создать"
  
@@ -2399,7 +2395,7 @@ msgstr "Создать"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Удалить"
  
@@ -2468,7 +2464,7 @@ msgstr "Шаблон для групп"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Роль"
@@ -2645,15 +2641,15 @@ msgid "Object group"
  msgstr "Объект группы"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2737,8 +2733,7 @@ msgid "Regular expression for matching group names"
  msgstr "Регулярное выражение, соответствующее именам групп"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2767,42 +2762,38 @@ msgstr ""
  "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
  "нажмите <i>Отмена</i>."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  #, fuzzy
  msgid "Phone queue"
  msgstr "Номер телефона"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  #, fuzzy
  msgid "Systems"
  msgstr "Системы"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Запуск"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Устройства"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Окружение"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Приложения"
  
@@ -2841,7 +2832,7 @@ msgstr "Регулярное выражение, соответствующее
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Объединения"
  
@@ -2863,46 +2854,46 @@ msgstr "Ошибка LDAP:"
  msgid "object group"
  msgstr "Объект группы"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Пользователь"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Группа"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Приложение"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Сервер"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Рабочая станция"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  #, fuzzy
  msgid "Windows Install"
  msgstr "Рабочая станция Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  #, fuzzy
  msgid "Terminal"
  msgstr "Терминалы"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Принтер"
@@ -2919,123 +2910,130 @@ msgstr "Информация"
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "подразделения"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  #, fuzzy
  msgid "people"
  msgstr "Показать людей"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "серверы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "рабочие станции"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "терминалы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  #, fuzzy
  msgid "printer"
  msgstr "принтеры"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "принтеры"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "телефоны"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "приложения"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "нет"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "слишком много различных объектов!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "пользователи"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  #, fuzzy
  msgid "winstations"
  msgstr "Рабочая станция"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "отключен"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "полный доступ"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "разрешить доступ только на эти хосты"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  #, fuzzy
  msgid "Non existing dn:"
  msgstr "Не существующий dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  #, fuzzy
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  "Вы можете комбинировать не более двух различных классов в одном объекте!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  #, fuzzy
  msgid "Object group generic"
  msgstr "Объект группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Системные доверия"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  #, fuzzy
  msgid "Member"
  msgstr "Включаемые объекты"
@@ -3087,7 +3085,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3125,7 +3123,7 @@ msgstr "Имя пользователя"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Шаблон"
@@ -3307,7 +3305,7 @@ msgid "Manage users"
  msgstr "Пользователи домена"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3316,7 +3314,7 @@ msgstr "Введенные пароли не совпадают!"
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3346,17 +3344,17 @@ msgstr "У вас недостаточно прав для удаления эт
  msgid "You have no permission to use this template!"
  msgstr "У вас недостаточно прав для удаления этого стоп-листа."
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  #, fuzzy
  msgid "You have no permission to change the lock status for this user!"
  msgstr "У вас недостаточно прав для смены своего пароля."
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Имя"
  
@@ -3404,10 +3402,10 @@ msgstr "Список"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Имя пользователя"
  
@@ -3868,13 +3866,13 @@ msgid "POSIX account"
  msgstr "Аккаунт FTP"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Моя учетная запись"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "Идентификатор пользователя"
  
@@ -3918,7 +3916,7 @@ msgstr "Показать людей"
  msgid "System trust model"
  msgstr "Системные доверия"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  #, fuzzy
  msgid "POSIX settings"
  msgstr "Атрибуты UNIX"
@@ -3967,18 +3965,18 @@ msgid "Template name"
  msgstr "Шаблон"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Обращение"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Академическое звание"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Дата рождения"
  
@@ -4003,9 +4001,9 @@ msgid "Private phone"
  msgstr "Личный телефон"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Домашняя страница"
@@ -4047,7 +4045,7 @@ msgid "Employee No."
  msgstr "Номер работника"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Форма трудоустройства"
@@ -4060,69 +4058,69 @@ msgid "Room No."
  msgstr "Номер комнаты"
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Мобильный"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Пейджер"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Специальность"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Описание подразделения"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Область деятельности"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Должность"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Местоположение сотрудника"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Подразделение"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Улица"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Почтовый индекс"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Номер дома"
@@ -4132,13 +4130,13 @@ msgid "Please use the phone tab"
  msgstr "Воспользуйтесь закладкой \"Телефон\""
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Последняя доставка"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Видимый всем"
@@ -4150,7 +4148,7 @@ msgstr "Почтовые настройки пользователя"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -4167,7 +4165,7 @@ msgid "Set new password"
  msgstr "Изменить пароль"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  #, fuzzy
  msgid "User picture"
  msgstr "Изображение"
@@ -4223,116 +4221,116 @@ msgstr ""
  msgid "No certificate installed"
  msgstr "Изменить сертификаты"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  #, fuzzy
  msgid "Password method"
  msgstr "Хэширование паролей"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  #, fuzzy
  msgid "The selected password method is no longer available."
  msgstr "У выбранного приложения нет параметров."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  #, fuzzy
  msgid "The selected password method requires initial configuration!"
  msgstr "У выбранного приложения нет параметров."
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  #, fuzzy
  msgid "Cannot open certificate!"
  msgstr "Невозможно выбрать базу данных!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Серийный номер сертификата"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Общая информация о пользователе"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  #, fuzzy
  msgid "Surname"
  msgstr "Имя сервера"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  #, fuzzy
  msgid "User identification"
  msgstr "Информация"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  #, fuzzy
  msgid "Gender"
  msgstr "Отправитель"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  #, fuzzy
  msgid "Preferred language"
  msgstr "Язык по умолчанию"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  #, fuzzy
  msgid "Department number"
  msgstr "Управление подразделениями"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  #, fuzzy
  msgid "Employee number"
  msgstr "Форма трудоустройства"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  #, fuzzy
  msgid "Room number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  #, fuzzy
  msgid "Telefon number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  #, fuzzy
  msgid "Pager number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  #, fuzzy
  msgid "Mobile number"
  msgstr "Домашний телефон"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  #, fuzzy
  msgid "Fax number"
  msgstr "Терминал"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  #, fuzzy
  msgid "Home phone number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "Хэширование паролей"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  #, fuzzy
  msgid "User certificates"
  msgstr "Стандартный сертификат"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  #, fuzzy
  msgid "You have no permission to set your password!"
  msgstr "У вас недостаточно прав для смены своего пароля."
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Общая информация о пользователе"
  
@@ -4424,7 +4422,7 @@ msgstr "У вас недостаточно прав для смены своег
  msgid "User password"
  msgstr "Новый пароль"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  #, fuzzy
  msgid "Password settings"
  msgstr "Почтовые настройки пользователя"
@@ -5268,7 +5266,7 @@ msgstr ""
  msgid "Completed"
  msgstr "не полный"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  #, fuzzy
  msgid "Next"
  msgstr "текст"
@@ -5544,284 +5542,299 @@ msgstr "отключен"
  msgid "Enabled"
  msgstr "отключен"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  #, fuzzy
  msgid "LDAP inspection"
  msgstr "Проверка конфигурации PHP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  #, fuzzy
  msgid "Checking for root object"
  msgstr "Проверка модуля gd"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  #, fuzzy
  msgid "Checking for invisible departments"
  msgstr "Проверка поддержки gettext"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  #, fuzzy
  msgid "Checking for invisible users"
  msgstr "Проверка поддержки gettext"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  #, fuzzy
  msgid "Checking for super administrator"
  msgstr "Проверка дополнительных программ"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  #, fuzzy
  msgid "Checking for users outside the people tree"
  msgstr "Проверка модуля cups"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  #, fuzzy
  msgid "Checking for groups outside the groups tree"
  msgstr "Проверка модуля cups"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  #, fuzzy
  msgid "Checking for duplicated UID numbers"
  msgstr "Проверка поддержки gettext"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  #, fuzzy
  msgid "Checking for duplicate GID numbers"
  msgstr "Проверка поддержки gettext"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "Проверка модуля gd"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "Проверка модуля cups"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "Проверка поддержки gettext"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  #, fuzzy
  msgid "LDAP query failed"
  msgstr "Невозможно выполнить запрос к базе данных!"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr "Укажите корректный номер телефона."
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr "Укажите корректный номер телефона."
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Ошибка"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  #, fuzzy
  msgid "Migrate"
  msgstr "Дата"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, fuzzy, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr "Вы собираетесь удалить объект %s."
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  #, fuzzy
  msgid "Move"
  msgstr "Режим"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  #, fuzzy
  msgid "Migration error"
  msgstr "Дата"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, fuzzy, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Список подразделений"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Создать настройки запись эл. почты"
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Input error"
  msgstr "Ошибка LDAP:"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Password error"
  msgstr "Срок действия пароля истекает"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Provided passwords do not match!"
  msgstr "Введенные пароли не совпадают!"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Specify a valid user ID!"
  msgstr "Введите корректное имя пользователя!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  #, fuzzy
  msgid "Cannot move users to the requested department!"
  msgstr "Невозможно подключиться к серверу базы данных!"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  #, fuzzy
  msgid "Try to create root object"
  msgstr "Объект группы"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, fuzzy, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Ошибка при выполнении \"%s\"!"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Служба печати"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -6033,17 +6046,17 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  #, fuzzy
  msgid "Hide changes"
  msgstr "Удалить телефонный аккаунт"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  #, fuzzy
  msgid "Show changes"
  msgstr "Показать телефоны"
@@ -6070,84 +6083,100 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Создать шаблон"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Создать настройки запись эл. почты"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+#, fuzzy
+msgid "Current"
+msgstr "Текущий пароль"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+#, fuzzy
+msgid "After migration"
+msgstr "Управление пользователями"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+#, fuzzy
+msgid "Reload"
+msgstr "чтение"
+
+#: setup/setup_migrate.tpl:245
  #, fuzzy
  msgid "Abort"
  msgstr "Порт"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  #, fuzzy
  msgid "Create a new GOsa administrator account"
  msgstr "Создать настройки запись эл. почты"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  #, fuzzy
  msgid "Password (again)"
  msgstr "Хэширование паролей"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-#, fuzzy
-msgid "Current"
-msgstr "Текущий пароль"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-#, fuzzy
-msgid "After migration"
-msgstr "Управление пользователями"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "Ссылки"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6327,11 +6356,6 @@ msgstr "Подключение"
  msgid "TLS connection"
  msgstr "Соединение..."
  
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "чтение"
-
  #: setup/setup_ldap.tpl:69
  #, fuzzy
  msgid "Authentication"
@@ -6703,7 +6727,7 @@ msgstr ""
  "закрыл браузер во время редактирования данных. Вы можете удалить файл "
  "блокировки, нажав на кнопку <i>Удалить</i>."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  msgid "Read only"
  msgstr ""
  
@@ -6717,6 +6741,18 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Создать"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
+#~ "использование, сначала нужно удалить учетную запись Samba."
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po

index 338a2b0434481c74e6f6ff2aeba6de5e88231455..12bcdf05792efc573fef9ca6db17bccb6bb0cf22 100644 (file)
--- a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: VIcore2\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\n"
  "PO-Revision-Date: 2008-07-04 09:59+0200\n"
  "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
  "Language-Team: Vietnamese\n"
@@ -38,24 +38,24 @@ msgstr "Copy và Paste bị thất bại!"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -73,12 +73,12 @@ msgstr "Không thể thiết lập phép cho '%s'"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -93,10 +93,10 @@ msgstr "'%s' không phải là một đối tượng LDAP hợp lệ"
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  msgid "Internal error"
  msgstr "Lỗi nội bộ"
  
@@ -115,8 +115,8 @@ msgstr "Các đối tượng này sẽ được paste: %s"
  msgid "This object will be pasted: %s"
  msgstr "Đối tượng này sẽ được paste: %s"
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "Paste"
  
@@ -162,12 +162,14 @@ msgid "Use ACL defined in role"
  msgstr "Sử dụng ACL được xác định trong vai trò"
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "Người dùng"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "Các nhóm"
  
@@ -192,7 +194,7 @@ msgstr "Hiệu chỉnh"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -234,8 +236,8 @@ msgstr "Tất cả các đối tượng hiện trong  cây thư mục con hiện
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -310,44 +312,43 @@ msgstr "ACL tác động lên tất cả người dùng"
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  msgid "LDAP error"
  msgstr "Lỗi LDAP"
  
@@ -454,16 +455,16 @@ msgstr "Lỗi XML trong gosa.conf: %s tại dòng %d"
  msgid "Cannot bind to LDAP. Please contact the system administrator."
  msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "SID và/hoặc RIDBASE đang bị mất trong cấu hình này!"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid "Configuration"
  msgstr "Cấu hình"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -745,15 +746,16 @@ msgstr "PHP mở rộng %s mất tích!"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -761,15 +763,16 @@ msgid "Cancel"
  msgstr "Hủy bỏ"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -780,12 +783,13 @@ msgid "Ok"
  msgstr "Ok"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "Áp dụng"
@@ -796,7 +800,7 @@ msgstr "Áp dụng"
  msgid "Save"
  msgstr "Lưu lại"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "Thêm vào"
@@ -837,12 +841,12 @@ msgstr "Hiệu chỉnh %s..."
  msgid "Back"
  msgstr "Quay lại"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
@@ -850,7 +854,7 @@ msgstr ""
  "Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc "
  "kích vào bên dưới."
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -859,7 +863,7 @@ msgstr ""
  "Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa "
  "thiết lập %s trước!"
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
@@ -867,7 +871,7 @@ msgstr ""
  "Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc "
  "kích vào bên dưới."
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -876,240 +880,231 @@ msgstr ""
  "Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải "
  "thêm thiết lập %s trước!"
  
-#: include/utils/class_msgPool.inc:410
-#, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"Tài khoản này đã có các thiết lập tính năng %s . Để tắt chúng đi, bạn cần "
-"phải thêm thiết lập %s trước!"
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, php-format
  msgid "Add %s settings"
  msgstr "Thêm thiết lập %s "
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, php-format
  msgid "Remove %s settings"
  msgstr "Xóa thiết lập %s"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr ""
  "Kích phím 'Hiệu chỉnh' bên dưới để thay đổi thông tin trong hộp thoại này "
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "Tháng Một"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "Tháng Hai"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "Tháng Ba"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "Tháng Tư"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "Tháng Năm"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "Tháng Sáu"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "Tháng Bảy"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "Tháng Tám"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "Tháng Chín"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "Tháng Mười"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "Tháng Mười Một"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "Tháng Mười Hai"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Sunday"
  msgstr "Chủ nhật"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Monday"
  msgstr "Thứ Hai"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr "Thứ Ba"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Wednesday"
  msgstr "Thứ Tư"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr "Thứ Năm"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr "Thứ Sáu"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr "Thứ Bảy"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "read operation"
  msgstr "Đọc thao tác"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr "thêm tao tác"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "modify operation"
  msgstr "thay đối thao tác"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "delete operation"
  msgstr "xóa thao tác"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "search operation"
  msgstr "tìm kiếm thao tác"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  msgid "authentication"
  msgstr "Xác định thẩm quyền"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, php-format
  msgid "LDAP %s failed!"
  msgstr "LDAP %s thất bại!"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  msgid "LDAP operation failed!"
  msgstr "Hoạt động LDAP thất bại!"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  msgid "Upload failed!"
  msgstr "Tải lên thất bại!"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, php-format
  msgid "Upload failed: %s"
  msgstr "Tải lên thất bại: %s"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại!"
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại: %s"
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr "'%s' này vẫn còn được sử dụng bởi đối tượng: %s "
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, php-format
  msgid "This '%s' is still in use."
  msgstr "'%s' này vẫn còn được sử dụng."
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "'%s' vẫn còn được sử dụng bởi các đối tượng này: %s"
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr "File '%s' không tồn tại!"
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "Không thể mở file '%s' để đọc!"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "Không thể mở file '%s' để viết!"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "Không thế xóa file '%s'!"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "Không thể tạo ra folder '%s'!"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "Không thể xóa folder '%s'!"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, php-format
  msgid "Checking for %s support"
  msgstr "Kiểm tra hỗ trợ %s"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr "Cài đặt và kích hoạt mô-đun PHP %s."
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr "GOsa hỗ trợ chương trình daemon"
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  msgid "Cannot not parse XML!"
  msgstr "Không thể phân tách XML!"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "Không thể  gửi thông báo trì hoãn đến entry %s!"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, php-format
  msgid "Cannot remove entry %s!"
  msgstr "Không thể xóa entry %s!"
@@ -1225,20 +1220,20 @@ msgstr "Sử dụng "
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "Cơ sở"
@@ -1251,14 +1246,14 @@ msgstr "Lọc các entry với chỉ lệnh này"
  msgid "Please fix the above error and reload the page."
  msgstr "Xin hãy sửa lỗi trên và reload trang trên."
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  "Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' "
  "để sửa lỗi này"
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1266,23 +1261,23 @@ msgstr ""
  "Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi "
  "này"
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  msgid "Fatal error"
  msgstr "Lỗi nặng"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, php-format
  msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
  msgstr ""
  "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  msgid "Username / UID is not unique inside the LDAP tree!"
  msgstr "Tên người dùng/ UID không phải là duy nhất trong cây LDAP!"
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
@@ -1290,11 +1285,11 @@ msgstr ""
  "Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
  "với Admin của bạn."
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr "Lỗi khi đang thêm một khóa vào. Hãy liên lạc với các nhà phát triển!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
@@ -1303,14 +1298,14 @@ msgstr ""
  "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với "
  "admin của bạn!"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, php-format
  msgid "LDAP server returned: %s"
  msgstr "LDAP server trả về: %s"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1319,19 +1314,19 @@ msgstr "LDAP server trả về: %s"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "Cảnh báo"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
@@ -1339,12 +1334,12 @@ msgstr ""
  "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra - "
  "hãy dọn sạch các tham chiếu."
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, php-format
  msgid ""
  "Set the new size limit to %s and show me this message if the limit still "
@@ -1353,73 +1348,73 @@ msgstr ""
  "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
  "vượt quá tiêu chuẩn"
  
-#: include/functions.inc:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "Cấu hình"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "chưa hoàn thành"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "Cứ tiếp tục"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "Cứ hiệu chỉnh"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "các entry cho mỗi trang"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "Áp dụng bộ lọc"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "snapshot phát triển GOsa (Rev %s)"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr "File '%s' không thể bị xóa."
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  msgid "Cannot write to revision file!"
  msgstr "Không thể viết lên revision file!"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  #, fuzzy
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr "'base_hook' không có. Hãy sử dụng cơ sở mặc định!"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "LDAP warning"
  msgstr "Cảnh báo LDAP"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr ""
  "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr "Đã từng lưu trữ thông tin cụ thể về tài khoản."
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
@@ -1427,32 +1422,32 @@ msgstr ""
  "Đã từng khóa các entry hiện đang được hiệu chỉnh nhằm tránh các thay đổi "
  "khác nhau tại cùng một thời điểm."
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr "Lớp đối tượng '%s' được yêu cầu mất tích!"
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr "Lớp đối tượng lựa chọn '%s' mất tích!"
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr "Phiên bản không phù hợp với lớp đối tượng '%s' được yêu cầu (!=%s)!"
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr "Phiên bản không phù hợp với lớp đối tượng lựa chọn '%s' (!=%s)!"
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, php-format
  msgid "Class(es) available"
  msgstr "Đã có lớp"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  msgid ""
  "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
  "schema    configuration do not support this option."
@@ -1460,7 +1455,7 @@ msgstr ""
  "Bạn vừa bật lựa chọn rfc2307bis lên trên bước ' cài đặt ldap', nhưng cấu "
  "hình giản đồ của bạn không hỗ trợ lựa chọn này."
  
-#: include/functions.inc:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
@@ -1468,7 +1463,7 @@ msgstr ""
  "Để có thể sử dụng được nhóm conform rfc2307bis, objectClass "
  "'posixGroup' (nhóm posix) phải được hỗ trợ     "
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  msgid ""
  "Your schema is configured to support the rfc2307bis group, but you have "
  "disabled this option on the 'ldap setup' step."
@@ -1476,51 +1471,51 @@ msgstr ""
  "Lược đồ của bạn được cấu hình để hỗ trợ nhóm rfc2307bis, nhưng bạn đã vừa "
  "tắt chức năng này đi trong bước 'cài đặt ldap'."
  
-#: include/functions.inc:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr "ObjectClass (Lớp đối tượng) 'posixGroup' phải CÓ CẤU TRÚC"
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "Tiếng Đức"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "Tiếng Pháp"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "Tiếng Ý"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "Tiếng Tây Ban Nha"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "Tiếng Anh"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "Tiếng Hà Lan"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "Tiếng Phần Lan"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr "Tiếng Trung Quốc"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  msgid "Vietnamese"
  msgstr "Tiếng Việt"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "Tiếng Nga"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1528,7 +1523,7 @@ msgstr ""
  "Lệnh '%s', được xác định là POSTMODIFY (thay đổi sau) cho chế độ plugin '%s' "
  "hình như không tồn tại."
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr "Không thể sinh ra hàm băm samba!"
  
@@ -1588,7 +1583,7 @@ msgstr "Loại"
  msgid "Arguments"
  msgstr "Tranh luận"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  "Không thể tìm thấy một phương pháp mật khẩu phù hợp cho hàm băm hiện tại!"
@@ -1641,7 +1636,7 @@ msgstr "Việc mã hóa DN không thống nhất phát hiện: '%s'"
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Bạn chuẩn bị xóa chế độ snapshot '%s'."
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr "Phục hồi lại snapshot"
  
@@ -1666,19 +1661,19 @@ msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "Mô tả"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
@@ -1686,7 +1681,7 @@ msgstr ""
  "Đối tượng đã bị thay đổi từ khi được mở trong GOsa. Nếu bạn lưu entry này "
  "lại, khi các đối tượng khác lạc hướng có thể gây ra thêm tất cả các thay đổi!"
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1695,8 +1690,8 @@ msgstr ""
  "Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa "
  "được thiết lập."
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1705,64 +1700,64 @@ msgstr ""
  msgid "Permission"
  msgstr "Cho phép"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "Bạn không được phép tạo ra snapshot cho %s."
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "Bạn không được phép phục hồi một snapshot cho %s."
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr "Thay đổi ACL dn"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr "Từ"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "to"
  msgstr "đến"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  msgid "Restore"
  msgstr "Phục hồi"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  msgid "Create snapshot"
  msgstr "Tạo ra snapshot"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  msgid "Create a new snapshot from this object"
  msgstr "Tạo ra một snapshot mới từ đối tượng này"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "cắt"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "Cắt entry này"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "Copy"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "Copy entry này"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  msgid "Copy"
  msgstr "Copy"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  msgid "Cut"
  msgstr "Cut"
  
@@ -1780,19 +1775,19 @@ msgstr ""
  "Mật khẩu người dùng đã được xác lập lại, hãy thiết lập một giá trị mật khẩu "
  "mới!"
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
  "configuration file."
  msgstr ""
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr "Qúa trình xóa đã bị hủy bỏ bởi plugin '%s': %s"
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "Các tham chiếu"
  
@@ -1825,12 +1820,12 @@ msgstr "Các tham chiếu"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1839,17 +1834,17 @@ msgstr "Các tham chiếu"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "Tên"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "Quốc Gia"
  
@@ -1867,7 +1862,7 @@ msgstr "Quốc Gia"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "Thiết lập quản trị"
@@ -1932,7 +1927,7 @@ msgstr "Đặt bộ phận như một đơn vị quản trị độc lập"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "Admin miền"
@@ -1947,7 +1942,7 @@ msgstr "Tên của cây con được tạo"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "Các danh mục"
@@ -1962,20 +1957,20 @@ msgstr "Các danh mục cho cây con"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "Vị trí"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "Bang"
@@ -1992,7 +1987,7 @@ msgstr "Vị trí của cây con"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2008,13 +2003,13 @@ msgstr "Địa chỉ bưu điện của cây con này"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2029,13 +2024,13 @@ msgstr "Đặt số điện thoại của cây con này"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2047,8 +2042,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "Đặt số fax của cây con này"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "Các bộ phận"
  
@@ -2056,7 +2051,7 @@ msgstr "Các bộ phận"
  msgid "Manage Departments"
  msgstr "Quản lý  các bộ phận"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2072,7 +2067,7 @@ msgstr "Quản lý  các bộ phận"
  msgid "Permission error"
  msgstr "Lỗi về cấp phép"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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 "
@@ -2081,7 +2076,7 @@ msgstr ""
  "Ngay sau khi thao tác chuyển dời kết thúc, bạn có thể kéo xuống cuối trang "
  "và kích vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
  
-#: plugins/admin/departments/class_departmentManagement.inc:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
@@ -2090,30 +2085,30 @@ msgstr ""
  "Ngay sau khi thao tác tag kết thúc, bạn có thể kéo xuống cuối trang và kích "
  "vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "Vị trí"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "Tổ chức"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2198,59 +2193,59 @@ msgstr ""
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr "Không thể tìm được một tag chưa được dùng cho đơn vị quản trị này!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Tagging '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Tiếp tục"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Chuyển từ '%s' đến '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Thất bại trong việc copy %s, bãi bỏ thao tác"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "Thông tin chung"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "Tên bộ phận"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "Số điện thoại"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Đối tượng '%s' đã bị tag"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Thêm tag (%s) vào đối tượng '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Bỏ tag từ đối tượng '%s'"
@@ -2261,7 +2256,7 @@ msgid "Organization name"
  msgstr "Tổ chức"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "Địa chỉ theo bưu điện"
  
@@ -2281,9 +2276,9 @@ msgstr "Danh sách các bộ phận"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  msgid "Select all"
  msgstr "Chọn tất"
  
@@ -2317,7 +2312,8 @@ msgstr "Bộ phận nộp"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "Tạo "
  
@@ -2329,7 +2325,7 @@ msgstr "Tạo "
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "Xóa bỏ"
  
@@ -2390,7 +2386,7 @@ msgstr "Hiển thị việc khớp ads"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "Vai trò"
@@ -2550,15 +2546,15 @@ msgid "Object group"
  msgstr "Nhóm đối tượng"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2632,8 +2628,7 @@ msgid "Regular expression for matching group names"
  msgstr "Biểu thức thông thường cho việc khớp các tên nhóm"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2660,40 +2655,36 @@ msgstr ""
  "Vì thế nếu bạn chắc chắn hãy nhấn \"Xóa bỏ\" để tiếp tục hoặc'Hủy bỏ' để "
  "dừng lại."
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "Các hàng phone"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  msgid "Systems"
  msgstr "Các hệ thống"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "Khởi động"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "Các thiết bị"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "Tóm tắt FAI"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "Môi trường"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "Các ứng dụng"
  
@@ -2732,7 +2723,7 @@ msgstr "Hiển thị thông thường cho việc khớp tên các đối tượn
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "Tất cả các nhóm đối tượng"
  
@@ -2751,44 +2742,44 @@ msgstr "Lỗi cơ sở hạ tầng"
  msgid "object group"
  msgstr "Nhóm đối tượng"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "Người dùng"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "Nhóm "
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "Ứng dụng"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "Máy chủ (server)"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "Máy trạm"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  msgid "Windows Install"
  msgstr "Cài đặt window"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "Thiết bị cuối "
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "Máy in"
@@ -2807,116 +2798,123 @@ msgstr ""
  "Bạn không thể kết hợp các thiết bị cuối và máy trạm vào trong một nhóm đối "
  "tượng!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "các bộ phận"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  msgid "people"
  msgstr "Người"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "các nhóm"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "các server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "máy trạm"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "các thiết bị cuối"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  msgid "printer"
  msgstr "máy in"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "các máy in"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "điện thoại"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "các ứng dụng"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "không có"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "có quá nhiều các đối tượng khác nhau!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "người dùng"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  msgid "winstations"
  msgstr "máy trạm dùng win "
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "Đã vô hiệu"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "Truy cập hoàn toàn"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "Cho phép truy cập đến các máy chủ này"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "dn không tồn tại:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  msgid "You can combine two different object types at maximum, only!"
  msgstr "Bạn chỉ có thể kết hợp hai đối tượng khác nhau tại mức cực đại!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  msgid "Object group generic"
  msgstr "Nhóm đối tượng chung"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Ủy thác hệ thống"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  msgid "Member"
  msgstr "Thành viên"
  
@@ -2965,7 +2963,7 @@ msgstr ""
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3002,7 +3000,7 @@ msgstr "Tên người dùng"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "Mẫu"
@@ -3157,7 +3155,7 @@ msgid "Manage users"
  msgstr "Quản lý người dùng"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3168,7 +3166,7 @@ msgstr ""
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3195,16 +3193,16 @@ msgstr "Bạn không được phép thay đổi đối tượng '%s'!"
  msgid "You have no permission to use this template!"
  msgstr "Bạn không được phép sử dụng mẫu này!"
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  msgid "You have no permission to change the lock status for this user!"
  msgstr "Bạn không được phép thay đổi trạng thái khóa cho người dùng này!"
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "Tên thật"
  
@@ -3249,10 +3247,10 @@ msgstr "Tên"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "Đăng nhập"
  
@@ -3682,13 +3680,13 @@ msgid "POSIX account"
  msgstr "tài khoản POSIX"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "Tài khoản của tôi"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "ID người dùng"
  
@@ -3724,7 +3722,7 @@ msgstr "Shadow hết hạn"
  msgid "System trust model"
  msgstr "Mô hình ủy thác hệ thống"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  msgid "POSIX settings"
  msgstr "Thiết lập POSIX"
  
@@ -3771,18 +3769,18 @@ msgid "Template name"
  msgstr "Tên Mẫu"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "Chức danh cá nhân"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "Chức danh học thuật"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "Ngày sinh"
  
@@ -3806,9 +3804,9 @@ msgid "Private phone"
  msgstr "Số điện thoại riêng"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "Trang chủ"
@@ -3850,7 +3848,7 @@ msgid "Employee No."
  msgstr "Số nhân viên"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "Loại nhân viên"
@@ -3863,69 +3861,69 @@ msgid "Room No."
  msgstr "Số phòng"
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "Điện thoại di động"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "Máy nhắn tin"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "Nghề nghiệp"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "Mô tả đơn vị "
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr "Lĩnh vực chuyên môn"
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "Danh xưng chức năng"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr "Địa phương của người dùng"
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "Đơn vị"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "Phố"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "Mã bưu điện"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "Mô tả căn nhà"
@@ -3935,13 +3933,13 @@ msgid "Please use the phone tab"
  msgstr "Xin hãy sử dụng Phone Tab"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "Lần cung cấp cuối"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "Hiển thị với tất cả mọi người"
@@ -3952,7 +3950,7 @@ msgstr "Thiết lập của người dùng"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -3967,7 +3965,7 @@ msgid "Set new password"
  msgstr "Đặt mật khẩu mới"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "Ảnh của người sử dụng"
  
@@ -4021,98 +4019,98 @@ msgstr "không hợp lệ"
  msgid "No certificate installed"
  msgstr "Không có giấy chứng nhận nào được cài đặt"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  msgid "Password method"
  msgstr "Phương pháp lập mật khẩu"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  msgid "The selected password method is no longer available."
  msgstr "Phương pháp lập mật khẩu được chọn này không còn ở đây."
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  msgid "The selected password method requires initial configuration!"
  msgstr "Phương pháp lập mật khẩu được chọn yêu cầu cấu hình ban đầu!"
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  msgid "Cannot open certificate!"
  msgstr "Không mở được giấy chứng nhận!"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "Số seri chứng nhận"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  msgid "Generic user settings"
  msgstr "Thiết lập chung của người dùng"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  #, fuzzy
  msgid "Surname"
  msgstr "Họ "
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  msgid "User identification"
  msgstr "Chứng nhận người dùng"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  msgid "Gender"
  msgstr "Giới tính"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  msgid "Preferred language"
  msgstr "Ngôn ngữ muốn sử dụng"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  msgid "Department number"
  msgstr "Số phòng làm việc"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  msgid "Employee number"
  msgstr "Số nhân viên"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  msgid "Room number"
  msgstr "Số phòng"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  msgid "Telefon number"
  msgstr "Số điện thoại"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  msgid "Pager number"
  msgstr "Số máy nhắn tin"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  msgid "Mobile number"
  msgstr "Số di động"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  msgid "Fax number"
  msgstr "Số fax"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "Đại chỉ nhà theo bưu điện"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  msgid "Home phone number"
  msgstr "Số điện thoại nhà"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "Phương pháp lập mật khẩu"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  msgid "User certificates"
  msgstr "Giấy phép của người dùng"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  msgid "You have no permission to set your password!"
  msgstr "Bạn không có quyền lập mật khẩu cho bạn!"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "Thông tin chung của người dùng"
  
@@ -4200,7 +4198,7 @@ msgstr "Bạn không có quyền thay đổi mật khẩu của bạn."
  msgid "User password"
  msgstr "Mật khẩu người dùng"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  msgid "Password settings"
  msgstr "Thiết lập mật khẩu"
  
@@ -5035,7 +5033,7 @@ msgstr ""
  msgid "Completed"
  msgstr "Đã hoàn thành"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  msgid "Next"
  msgstr "Tiếp tục"
  
@@ -5293,109 +5291,113 @@ msgstr "Vô hiệu hóa/ Tắt chức năng"
  msgid "Enabled"
  msgstr "Bật chức năng"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  msgid "LDAP inspection"
  msgstr "Thanh tra LDAP"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr "Phân tích LDAP hiện tại của bạn để xem khả năng tương thích với GOsa"
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  msgid "Checking for root object"
  msgstr "Kiểm tra đối tượng gốc"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr "Kiểm tra các cho phép trên cơ sở dữ liệu LDAP "
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  msgid "Checking for invisible departments"
  msgstr "Kiểm tra các bộ phận ẩn"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  msgid "Checking for invisible users"
  msgstr "Kiểm tra những người dùng ẩn"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  msgid "Checking for super administrator"
  msgstr "Kiểm tra siêu admin"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  msgid "Checking for users outside the people tree"
  msgstr "Kiểm tra người dùng bên ngoài cây con người"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  msgid "Checking for groups outside the groups tree"
  msgstr "Kiểm tra nhóm bên ngoài cây nhóm"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr "Kiểm tra máy trạm window bên ngoài cây máy trạm window"
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  msgid "Checking for duplicated UID numbers"
  msgstr "Kiểm tra các số ID cuả người dùng (UID) được nhân bản"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  msgid "Checking for duplicate GID numbers"
  msgstr "Kiểm tra các số ID của nhóm (GID) được nhân bản"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "Kiểm tra đối tượng gốc"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "Kiểm tra người dùng bên ngoài cây con người"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "Kiểm tra các bộ phận ẩn"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  msgid "LDAP query failed"
  msgstr "Yêu cầu LDAP thất bại"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr "Có thể 'đối tượng gốc' bị mất tích."
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr "Đã tìm được %s giá trị nhân bản cho thuộc tính  'uidNumder'."
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr "Đã tìm được %s giá trị nhân bản cho thuộc tính  'gidNumder'."
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "Thất bại"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
@@ -5403,161 +5405,172 @@ msgstr ""
  "Đã tìm thấy %s máy trạm win bên ngoài bộ phận winstation đã được xác định "
  "trước '%s'."
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  msgid "Migrate"
  msgstr "Di trú"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr "Đã tìm thấy %s nhóm bên ngoài cây được cấu hình '%s'."
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  msgid "Move"
  msgstr "Chuyển"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr "Đã tìm thấy %s người dùng  bên ngoài cây được cấu hình '%s'."
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  "Người dùng '%s' không có toàn quyền truy cập vào cơ sở dữ liệu LDAP của bạn."
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr "Đã tìm thấy %s người dùng mà không hiên thị trên GOsa."
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  msgid "Migration error"
  msgstr "Lỗi di trú"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "Không thể di trú bộ phận '%s':"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr "Tìm thấy %s bộ phận mà không hiển thị trên Gosa."
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "Không có một tài khoản Admin cùa Gosa nào trong LDAP của bạn."
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr "Không có một tài khoản Admin cùa Gosa nào trong LDAP của bạn."
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr "Không thể thêm ACL cho người dùng '%s':"
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Input error"
  msgstr "Lỗi nhập vào"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Password error"
  msgstr "Lỗi mật mã"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  msgid "Provided passwords do not match!"
  msgstr "Những mật khẩu được cung cấp không phù hợp!"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  msgid "Specify a valid user ID!"
  msgstr "Xác định một ID người dùng hợp lệ!"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr ""
  "Việc thêm một người dùng quản trị đã thất bại: đối tượng '%s' đã có rồi!"
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  msgid "Cannot move users to the requested department!"
  msgstr "Không thể chuyển người dùng đến bộ phận được yêu cầu!"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr "Máy trạm Win sẽ được chuyển từ"
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr "Cập nhật cả các tham chiếu sau"
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr "Nhóm sẽ được chuyển từ"
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr "Người dùng sẽ được chuyển từ"
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr "Tham chiếu sau sẽ được cập nhật"
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  "Đối tượng gốc LDAP đang mất tích. Để sử dụng dịch vụ LDAP của bạn, bạn cần "
  "có nó."
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr "Cố tạo ra một đối tượng gốc"
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr "Đối tượng gốc không thể được tạo ra, bạn phải cố tự mình tạo ra nó."
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "Sao chép '%s' đến '%s' bị thất bại:"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Tải lên thất bại: %s"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -5757,16 +5770,16 @@ msgid "Move selected groups into this group tree"
  msgstr "Chuyển các nhóm đã chọn vào trong các cây nhóm"
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr "Ẩn các thay đổi"
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  msgid "Show changes"
  msgstr "Hiển thị các thay đổi"
  
@@ -5796,25 +5809,52 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "Chuyển người dùng sang cây người dùng được cấu hình"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "Tạo ra một tài khoản admin GOsa mới"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+msgid "Current"
+msgstr "Hiện tại"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+msgid "After migration"
+msgstr "Sau khi di trú"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+msgid "Reload"
+msgstr "Tải lại"
+
+#: setup/setup_migrate.tpl:245
  msgid "Abort"
  msgstr "Ngừng lại"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  msgid "Create a new GOsa administrator account"
  msgstr "Tạo ra một tài khoản admin GOsa mới"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr "Hộp thoại này sẽ tự động thêm một siêu admin mới vào cây LDAP của bạn."
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  msgid "Password (again)"
  msgstr "Mật khẩu (nhập lại)"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
@@ -5824,9 +5864,9 @@ msgstr ""
  "GOsa. Nếu bạn muốn thay đổi việc này cho một số entry, lựa chọn chúng và sử "
  "dụng phím 'di trú' ở dưới."
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
@@ -5834,19 +5874,7 @@ msgstr ""
  "Nếu bạn muốn biết việc gì sẽ được tiến hành khi di trú các entry được chọn "
  "này, hãy sử dụng phím 'hiển thị thay đổi 'để xem định dạng LDIF."
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-msgid "Current"
-msgstr "Hiện tại"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-msgid "After migration"
-msgstr "Sau khi di trú"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  #, fuzzy
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
@@ -5857,7 +5885,7 @@ msgstr ""
  "Gosa. Nếu bạn muốn thay đổi việc này cho một số entry, lựa chọn chúng và sử "
  "dụng phím \"Di trú\" ở dưới."
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  #, fuzzy
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
@@ -5868,13 +5896,13 @@ msgstr ""
  "Gosa. Nếu bạn muốn thay đổi việc này cho một số entry, lựa chọn chúng và sử "
  "dụng phím \"Di trú\" ở dưới."
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "Các tham chiếu"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  #, fuzzy
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
@@ -5885,7 +5913,7 @@ msgstr ""
  "Gosa. Nếu bạn muốn thay đổi việc này cho một số entry, lựa chọn chúng và sử "
  "dụng phím \"Di trú\" ở dưới."
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  #, fuzzy
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
@@ -6065,10 +6093,6 @@ msgstr "Kết nối URL"
  msgid "TLS connection"
  msgstr "Kết nối TLS"
  
-#: setup/setup_ldap.tpl:65
-msgid "Reload"
-msgstr "Tải lại"
-
  #: setup/setup_ldap.tpl:69
  msgid "Authentication"
  msgstr "Thẩm định quyền"
@@ -6438,7 +6462,7 @@ msgstr ""
  "duyệt web trong quá trình thao tác hiệu chỉnh. Bạn có thể muốn tiếp quản "
  "việc khóa bằng các nhấn vào nút 'tiếp tục hiệu chỉnh'."
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  #, fuzzy
  msgid "Read only"
  msgstr "Danh sách reload"
@@ -6455,6 +6479,17 @@ msgstr ""
  "Xin hãy đóng cửa sổ trình duyệt này lại và dọn sạch bộ nhớ đệm thẩm định "
  "quyền để tránh việc tự động thẩm định lại quyền bằng trình duyệt của bạn."
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "Tạo "
+
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "Tài khoản này đã có các thiết lập tính năng %s . Để tắt chúng đi, bạn cần "
+#~ "phải thêm thiết lập %s trước!"
+
  #~ msgid "CUPS"
  #~ msgstr "CUPS  (hệ thống in unix thông thường)"
  
diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po

index 48320dc1291a928b71da1913d04f6065b6445102..930fcf04993899bf4319e0756115b710a352f4bb 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-11-26 16:03+0100\n"
+"POT-Creation-Date: 2008-12-09 15:29+0100\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"
@@ -36,24 +36,24 @@ msgstr "拷贝和粘贴精灵"
  #: include/class_CopyPasteHandler.inc:268
  #: include/class_CopyPasteHandler.inc:367 include/utils/class_msgPool.inc:153
  #: 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_gosaSupportDaemon.inc:1154
-#: include/class_gosaSupportDaemon.inc:1174 include/class_msg_dialog.inc:99
-#: include/password-methods/class_password-methods.inc:154
+#: include/utils/class_msgPool.inc:466 include/utils/class_msgPool.inc:485
+#: include/class_gosaSupportDaemon.inc:1160
+#: include/class_gosaSupportDaemon.inc:1180 include/class_msg_dialog.inc:99
+#: include/password-methods/class_password-methods.inc:250
  #: include/class_log.inc:138 include/class_log.inc:218
-#: include/class_plugin.inc:653 include/class_plugin.inc:694
-#: include/class_plugin.inc:736 include/class_plugin.inc:1571
-#: include/class_tabs.inc:48 plugins/admin/groups/class_groupGeneric.inc:954
+#: include/class_plugin.inc:659 include/class_plugin.inc:700
+#: include/class_plugin.inc:742 include/class_plugin.inc:1582
+#: include/class_tabs.inc:50 plugins/admin/groups/class_groupGeneric.inc:954
  #: plugins/admin/groups/class_groupGeneric.inc:959
  #: plugins/admin/groups/class_groupGeneric.inc:1204
  #: plugins/personal/posix/class_posixAccount.inc:1334
  #: plugins/personal/generic/class_user.inc:412
  #: plugins/personal/generic/class_user.inc:513
-#: plugins/personal/generic/class_user.inc:805
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/personal/generic/main.inc:104 html/index.php:222 html/index.php:226
+#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:1382
+#: plugins/personal/generic/main.inc:109 html/index.php:222 html/index.php:226
  #: setup/setup_checks.tpl:30 setup/setup_checks.tpl:91
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #: ihtml/themes/default/msg_dialog.tpl:52
  #: ihtml/themes/default/msg_dialog.tpl:95
  #, php-format
@@ -71,12 +71,12 @@ msgstr "无法创建文件 '%s'。"
  #: include/class_CopyPasteHandler.inc:176
  #: include/class_CopyPasteHandler.inc:185
  #: include/class_CopyPasteHandler.inc:193 include/class_pluglist.inc:177
-#: include/class_config.inc:126 include/class_config.inc:629
-#: include/utils/class_timezone.inc:47 include/functions.inc:639
-#: include/functions.inc:2564 include/functions.inc:2596
+#: include/class_config.inc:126 include/class_config.inc:630
+#: include/utils/class_timezone.inc:47 include/functions.inc:637
+#: include/functions.inc:2555 include/functions.inc:2588
  #: include/password-methods/class_password-methods-ssha.inc:51
  #: include/password-methods/class_password-methods-sha.inc:48
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #: plugins/admin/groups/class_groupGeneric.inc:163
  #: plugins/admin/groups/class_groupGeneric.inc:728 html/password.php:74
  #: html/index.php:142 html/index.php:214 html/main.php:213
@@ -92,10 +92,10 @@ msgstr ""
  #: include/class_CopyPasteHandler.inc:159
  #: include/class_CopyPasteHandler.inc:269 include/class_acl.inc:905
  #: include/class_ldap.inc:648 include/class_ldap.inc:696
-#: include/functions.inc:466 include/functions.inc:629
-#: include/functions.inc:730 include/functions.inc:1113
-#: include/functions.inc:1923 include/functions.inc:1957
-#: include/functions.inc:1977 include/class_log.inc:88
+#: include/functions.inc:467 include/functions.inc:627
+#: include/functions.inc:724 include/functions.inc:1107
+#: include/functions.inc:1917 include/functions.inc:1951
+#: include/functions.inc:1971 include/class_log.inc:88
  #, fuzzy
  msgid "Internal error"
  msgstr "终端服务器"
@@ -115,8 +115,8 @@ msgstr ""
  msgid "This object will be pasted: %s"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2051
-#: include/class_plugin.inc:2054
+#: include/class_CopyPasteHandler.inc:506 include/class_plugin.inc:2062
+#: include/class_plugin.inc:2065
  msgid "Paste"
  msgstr "粘贴"
  
@@ -169,12 +169,14 @@ msgid "Use ACL defined in role"
  msgstr ""
  
  #: include/class_acl.inc:220 plugins/admin/users/class_userManagement.inc:26
-#: plugins/personal/generic/class_user.inc:1547
+#: plugins/personal/generic/class_user.inc:1549
+#: setup/class_setupStep_Migrate.inc:1028
  msgid "Users"
  msgstr "用户"
  
  #: include/class_acl.inc:220 plugins/admin/groups/class_groupGeneric.inc:1258
  #: plugins/admin/groups/class_groupManagement.inc:26
+#: setup/class_setupStep_Migrate.inc:1031
  msgid "Groups"
  msgstr "用户组"
  
@@ -199,7 +201,7 @@ msgstr "编辑"
  
  #: include/class_acl.inc:472 include/class_acl.inc:476
  #: include/class_acl.inc:1202 include/class_acl.inc:1203
-#: include/class_acl.inc:1208 include/class_tabs.inc:380
+#: include/class_acl.inc:1208 include/class_tabs.inc:391
  #: plugins/admin/acl/class_divListACL.inc:179
  #: plugins/admin/acl/tabs_acl.inc:28
  #: plugins/admin/acl/class_aclManagement.inc:26
@@ -242,8 +244,8 @@ msgstr ""
  
  #: include/class_acl.inc:728 include/class_acl.inc:735
  #: include/class_acl.inc:742 include/class_acl.inc:748
-#: include/utils/class_msgPool.inc:462
-#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: include/utils/class_msgPool.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:573
  #: ihtml/themes/default/snapshotdialog.tpl:20
  #: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
@@ -324,44 +326,43 @@ msgstr ""
  
  #: include/class_acl.inc:1170 include/class_ldap.inc:705
  #: include/class_ldap.inc:1171 include/class_config.inc:260
-#: include/functions.inc:363 include/functions.inc:389
-#: include/functions.inc:397 include/functions.inc:426
-#: include/functions.inc:654 include/functions.inc:701
-#: include/functions.inc:743 include/functions.inc:788
-#: include/functions.inc:2543 include/functions.inc:2784
-#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:922
-#: include/class_plugin.inc:1234 include/class_plugin.inc:1283
-#: include/class_plugin.inc:1287 include/class_plugin.inc:1359
-#: include/class_plugin.inc:1417 include/class_plugin.inc:1483
-#: include/class_plugin.inc:1498
+#: include/functions.inc:364 include/functions.inc:390
+#: include/functions.inc:398 include/functions.inc:427
+#: include/functions.inc:652 include/functions.inc:695
+#: include/functions.inc:737 include/functions.inc:782
+#: include/functions.inc:2534 include/functions.inc:2776
+#: include/class_MultiSelectWindow.inc:550 include/class_plugin.inc:928
+#: include/class_plugin.inc:1240 include/class_plugin.inc:1289
+#: include/class_plugin.inc:1293 include/class_plugin.inc:1308
+#: include/class_plugin.inc:1368 include/class_plugin.inc:1426
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1507
  #: plugins/admin/departments/class_departmentGeneric.inc:241
-#: plugins/admin/departments/class_departmentGeneric.inc:431
-#: plugins/admin/departments/class_departmentGeneric.inc:704
-#: plugins/admin/departments/class_departmentGeneric.inc:735
+#: plugins/admin/departments/class_departmentGeneric.inc:428
+#: plugins/admin/departments/class_departmentGeneric.inc:701
+#: plugins/admin/departments/class_departmentGeneric.inc:732
  #: plugins/admin/acl/class_aclRole.inc:616
  #: plugins/admin/acl/class_aclRole.inc:656
  #: plugins/admin/acl/class_aclRole.inc:670
-#: plugins/admin/ogroups/class_ogroup.inc:1027
-#: plugins/admin/ogroups/class_ogroup.inc:1041
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/ogroups/class_ogroup.inc:1030
+#: plugins/admin/ogroups/class_ogroup.inc:1044
  #: plugins/admin/groups/class_groupGeneric.inc:758
  #: plugins/admin/groups/class_groupGeneric.inc:1069
  #: plugins/personal/posix/class_posixAccount.inc:678
  #: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/personal/generic/class_user.inc:721
-#: plugins/personal/generic/class_user.inc:1082 html/index.php:252
+#: plugins/personal/generic/class_user.inc:722
+#: plugins/personal/generic/class_user.inc:1084 html/index.php:252
  #: html/index.php:267 html/index.php:280
-#: setup/class_setupStep_Migrate.inc:1101
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
-#: setup/class_setupStep_Migrate.inc:2126
-#: setup/class_setupStep_Migrate.inc:2130
-#: setup/class_setupStep_Migrate.inc:2320
-#: setup/class_setupStep_Migrate.inc:2340
-#: setup/class_setupStep_Migrate.inc:2457
-#: setup/class_setupStep_Migrate.inc:2804
-#: setup/class_setupStep_Migrate.inc:2818
+#: setup/class_setupStep_Migrate.inc:1197
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
+#: setup/class_setupStep_Migrate.inc:2250
+#: setup/class_setupStep_Migrate.inc:2254
+#: setup/class_setupStep_Migrate.inc:2444
+#: setup/class_setupStep_Migrate.inc:2464
+#: setup/class_setupStep_Migrate.inc:2581
+#: setup/class_setupStep_Migrate.inc:2928
+#: setup/class_setupStep_Migrate.inc:2942
  #, fuzzy
  msgid "LDAP error"
  msgstr "LDAP 错误:"
@@ -463,17 +464,17 @@ msgstr "XML 出错于 gosa.conf: %s ，行 %d"
  msgid "Cannot bind to LDAP. Please contact the system administrator."
  msgstr "无法绑定 LDAP。请联系系统管理员。"
  
-#: include/class_config.inc:629
+#: include/class_config.inc:630
  #, fuzzy
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "您的配置文件缺少 SID 和/或 RIDBASE！"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  #, fuzzy
  msgid "Configuration"
  msgstr "配置文件"
  
-#: include/class_config.inc:979
+#: include/class_config.inc:980
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -768,15 +769,16 @@ msgstr "删除打印机扩展"
  
  #: include/utils/class_msgPool.inc:308 include/class_baseSelectDialog.inc:62
  #: setup/setup_migrate.tpl:135 setup/setup_migrate.tpl:186
-#: setup/setup_migrate.tpl:252 setup/setup_migrate.tpl:308
-#: setup/setup_migrate.tpl:361 setup/setup_migrate.tpl:406
-#: setup/setup_migrate.tpl:449 setup/setup_migrate.tpl:493
-#: setup/setup_ldap.tpl:17 ihtml/themes/default/acl.tpl:128
-#: ihtml/themes/default/acl.tpl:142 ihtml/themes/default/snapshotdialog.tpl:44
+#: setup/setup_migrate.tpl:233 setup/setup_migrate.tpl:298
+#: setup/setup_migrate.tpl:354 setup/setup_migrate.tpl:407
+#: setup/setup_migrate.tpl:452 setup/setup_migrate.tpl:495
+#: setup/setup_migrate.tpl:539 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/acl.tpl:128 ihtml/themes/default/acl.tpl:142
+#: ihtml/themes/default/snapshotdialog.tpl:44
  #: ihtml/themes/default/snapshotdialog.tpl:89
  #: ihtml/themes/default/remove.tpl:15
  #: ihtml/themes/default/copyPasteDialog.tpl:21
-#: ihtml/themes/default/islocked.tpl:17 ihtml/themes/default/msg_dialog.tpl:74
+#: ihtml/themes/default/islocked.tpl:19 ihtml/themes/default/msg_dialog.tpl:74
  #: ihtml/themes/default/msg_dialog.tpl:127
  #: ihtml/themes/default/msg_dialog.tpl:130
  #, php-format
@@ -784,15 +786,16 @@ msgid "Cancel"
  msgstr "取消"
  
  #: include/utils/class_msgPool.inc:314 setup/setup_checks.tpl:27
-#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:251
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:364
-#: setup/class_setupStep_Migrate.inc:437 setup/class_setupStep_Migrate.inc:514
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:642
-#: setup/class_setupStep_Migrate.inc:783 setup/class_setupStep_Migrate.inc:938
-#: setup/class_setupStep_Migrate.inc:1844
-#: setup/class_setupStep_Migrate.inc:2265
-#: setup/class_setupStep_Migrate.inc:2419
-#: setup/class_setupStep_Migrate.inc:2749
+#: setup/setup_checks.tpl:87 setup/class_setupStep_Migrate.inc:257
+#: setup/class_setupStep_Migrate.inc:309 setup/class_setupStep_Migrate.inc:370
+#: setup/class_setupStep_Migrate.inc:443 setup/class_setupStep_Migrate.inc:520
+#: setup/class_setupStep_Migrate.inc:595 setup/class_setupStep_Migrate.inc:648
+#: setup/class_setupStep_Migrate.inc:789
+#: setup/class_setupStep_Migrate.inc:1034
+#: setup/class_setupStep_Migrate.inc:1968
+#: setup/class_setupStep_Migrate.inc:2389
+#: setup/class_setupStep_Migrate.inc:2543
+#: setup/class_setupStep_Migrate.inc:2873
  #: ihtml/themes/default/msg_dialog.tpl:71
  #: ihtml/themes/default/msg_dialog.tpl:73
  #: ihtml/themes/default/msg_dialog.tpl:124
@@ -803,12 +806,13 @@ msgid "Ok"
  msgstr "好"
  
  #: include/utils/class_msgPool.inc:320 setup/setup_migrate.tpl:133
-#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:251
-#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:359
-#: setup/setup_migrate.tpl:404 setup/setup_migrate.tpl:447
-#: setup/setup_migrate.tpl:491 setup/setup_ldap.tpl:16
-#: ihtml/themes/default/acl.tpl:29 ihtml/themes/default/acl.tpl:52
-#: ihtml/themes/default/acl.tpl:125 ihtml/themes/default/acl.tpl:140
+#: setup/setup_migrate.tpl:184 setup/setup_migrate.tpl:232
+#: setup/setup_migrate.tpl:297 setup/setup_migrate.tpl:352
+#: setup/setup_migrate.tpl:405 setup/setup_migrate.tpl:450
+#: setup/setup_migrate.tpl:493 setup/setup_migrate.tpl:537
+#: setup/setup_ldap.tpl:16 ihtml/themes/default/acl.tpl:29
+#: ihtml/themes/default/acl.tpl:52 ihtml/themes/default/acl.tpl:125
+#: ihtml/themes/default/acl.tpl:140
  #, php-format
  msgid "Apply"
  msgstr "应用"
@@ -819,7 +823,7 @@ msgstr "应用"
  msgid "Save"
  msgstr "保存"
  
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2555
+#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2679
  #, php-format
  msgid "Add"
  msgstr "添加"
@@ -860,18 +864,18 @@ msgstr "编辑用户"
  msgid "Back"
  msgstr "返回"
  
-#: include/utils/class_msgPool.inc:375
+#: include/utils/class_msgPool.inc:376
  #, fuzzy, php-format
  msgid "This account has no valid %s extensions!"
  msgstr "该账户没有有效的 Gosa 扩展。"
  
-#: include/utils/class_msgPool.inc:381
+#: include/utils/class_msgPool.inc:382
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. You can disable them by clicking below."
  msgstr "这个账户已经启用 posix 功能。要禁用请点击下面按钮。"
  
-#: include/utils/class_msgPool.inc:384 include/utils/class_msgPool.inc:391
+#: include/utils/class_msgPool.inc:385 include/utils/class_msgPool.inc:392
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings enabled. To disable them, you'll need to remove "
@@ -879,13 +883,13 @@ msgid ""
  msgstr ""
  "这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
  
-#: include/utils/class_msgPool.inc:400
+#: include/utils/class_msgPool.inc:401
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. You can enable them by clicking below."
  msgstr "这个账户已经启用 posix 功能。要启用请点击下面按钮。"
  
-#: include/utils/class_msgPool.inc:403
+#: include/utils/class_msgPool.inc:404 include/utils/class_msgPool.inc:411
  #, fuzzy, php-format
  msgid ""
  "This account has %s settings disabled. To enable them, you'll need to add "
@@ -893,249 +897,241 @@ msgid ""
  msgstr ""
  "这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
  
-#: include/utils/class_msgPool.inc:410
-#, fuzzy, php-format
-msgid ""
-"This account has %s features settings. To disable them, you'll need to add "
-"the %s settings first!"
-msgstr ""
-"这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
-
-#: include/utils/class_msgPool.inc:418
+#: include/utils/class_msgPool.inc:419
  #, fuzzy, php-format
  msgid "Add %s settings"
  msgstr "应用程序设置"
  
-#: include/utils/class_msgPool.inc:424
+#: include/utils/class_msgPool.inc:425
  #, fuzzy, php-format
  msgid "Remove %s settings"
  msgstr "Posix 设置"
  
-#: include/utils/class_msgPool.inc:430
+#: include/utils/class_msgPool.inc:431
  msgid "Click the 'Edit' button below to change informations in this dialog"
  msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "January"
  msgstr "一月"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "February"
  msgstr "二月"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "March"
  msgstr "三月"
  
-#: include/utils/class_msgPool.inc:436
+#: include/utils/class_msgPool.inc:437
  msgid "April"
  msgstr "四月"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "May"
  msgstr "五月"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "June"
  msgstr "六月"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "July"
  msgstr "七月"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "August"
  msgstr "八月"
  
-#: include/utils/class_msgPool.inc:437
+#: include/utils/class_msgPool.inc:438
  msgid "September"
  msgstr "九月"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "October"
  msgstr "十月"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "November"
  msgstr "十一月"
  
-#: include/utils/class_msgPool.inc:438
+#: include/utils/class_msgPool.inc:439
  msgid "December"
  msgstr "十二月"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Sunday"
  msgstr "姓"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Monday"
  msgstr "月"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Tuesday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  #, fuzzy
  msgid "Wednesday"
  msgstr "星期三"
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Thursday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Friday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:444
+#: include/utils/class_msgPool.inc:445
  msgid "Saturday"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "read operation"
  msgstr "邮件选项"
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  msgid "add operation"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:451
+#: include/utils/class_msgPool.inc:452
  #, fuzzy
  msgid "modify operation"
  msgstr "个人信息"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "delete operation"
  msgstr "选择查看工作站"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "search operation"
  msgstr "账号过期于"
  
-#: include/utils/class_msgPool.inc:452
+#: include/utils/class_msgPool.inc:453
  #, fuzzy
  msgid "authentication"
  msgstr "Nagios 鉴权"
  
-#: include/utils/class_msgPool.inc:455
+#: include/utils/class_msgPool.inc:456
  #, fuzzy, php-format
  msgid "LDAP %s failed!"
  msgstr "Mysql 查询失败。"
  
-#: include/utils/class_msgPool.inc:457
+#: include/utils/class_msgPool.inc:458
  #, fuzzy
  msgid "LDAP operation failed!"
  msgstr "Mysql 查询失败。"
  
-#: include/utils/class_msgPool.inc:472
+#: include/utils/class_msgPool.inc:473
  #, fuzzy
  msgid "Upload failed!"
  msgstr "用户登录失败。LDAP 服务器返回 '%s'。"
  
-#: include/utils/class_msgPool.inc:475
+#: include/utils/class_msgPool.inc:476
  #, fuzzy, php-format
  msgid "Upload failed: %s"
  msgstr "Logging DB 用户"
  
-#: include/utils/class_msgPool.inc:482
+#: include/utils/class_msgPool.inc:483
  msgid "Communication failure with the infrastructure service!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:484
+#: include/utils/class_msgPool.inc:485
  #, php-format
  msgid "Communication failure with the infrastructure service: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:491 include/utils/class_msgPool.inc:494
+#: include/utils/class_msgPool.inc:492 include/utils/class_msgPool.inc:495
  #, php-format
  msgid "This '%s' is still in use by this object: %s"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:497
+#: include/utils/class_msgPool.inc:498
  #, fuzzy, php-format
  msgid "This '%s' is still in use."
  msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
  
-#: include/utils/class_msgPool.inc:499
+#: include/utils/class_msgPool.inc:500
  #, fuzzy, php-format
  msgid "This '%s' is still in use by these objects: %s"
  msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
  
-#: include/utils/class_msgPool.inc:505
+#: include/utils/class_msgPool.inc:506
  #, php-format
  msgid "File '%s' does not exist!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:511
+#: include/utils/class_msgPool.inc:512
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for reading!"
  msgstr "无法打开文件 '%s'。"
  
-#: include/utils/class_msgPool.inc:517
+#: include/utils/class_msgPool.inc:518
  #, fuzzy, php-format
  msgid "Cannot open file '%s' for writing!"
  msgstr "无法打开文件 '%s'。"
  
-#: include/utils/class_msgPool.inc:523
+#: include/utils/class_msgPool.inc:524
  #, php-format
  msgid ""
  "The value for '%s' is currently unconfigured or invalid, please check your "
  "configuration file!"
  msgstr ""
  
-#: include/utils/class_msgPool.inc:529
+#: include/utils/class_msgPool.inc:530
  #, fuzzy, php-format
  msgid "Cannot delete file '%s'!"
  msgstr "无法打开文件 '%s'。"
  
-#: include/utils/class_msgPool.inc:535
+#: include/utils/class_msgPool.inc:536
  #, fuzzy, php-format
  msgid "Cannot create folder '%s'!"
  msgstr "转到根部门"
  
-#: include/utils/class_msgPool.inc:541
+#: include/utils/class_msgPool.inc:542
  #, fuzzy, php-format
  msgid "Cannot delete folder '%s'!"
  msgstr "无法打开文件 '%s'。"
  
-#: include/utils/class_msgPool.inc:547
+#: include/utils/class_msgPool.inc:548
  #, fuzzy, php-format
  msgid "Checking for %s support"
  msgstr "检查 iconv 支持"
  
-#: include/utils/class_msgPool.inc:553
+#: include/utils/class_msgPool.inc:554
  #, php-format
  msgid "Install and activate the %s PHP module."
  msgstr ""
  
-#: include/utils/class_msgPool.inc:559
+#: include/utils/class_msgPool.inc:560
  #, php-format
  msgid ""
  "Cannot initialize class '%s'! Maybe there is a plugin missing in your gosa "
  "setup?"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:98
+#: include/class_gosaSupportDaemon.inc:104
  msgid "GOsa support daemon"
  msgstr ""
  
-#: include/class_gosaSupportDaemon.inc:773
+#: include/class_gosaSupportDaemon.inc:779
  #, fuzzy
  msgid "Cannot not parse XML!"
  msgstr "太多用户，无法分配一个可用的 ID！"
  
-#: include/class_gosaSupportDaemon.inc:1154
+#: include/class_gosaSupportDaemon.inc:1160
  #, fuzzy, php-format
  msgid "Cannot send abort event for entry %s!"
  msgstr "无法创建文件 '%s'。"
  
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
  #, fuzzy, php-format
  msgid "Cannot remove entry %s!"
  msgstr "未知 FAIstate %s"
@@ -1252,20 +1248,20 @@ msgstr "用户"
  #: plugins/admin/departments/country.tpl:28
  #: plugins/admin/departments/organization.tpl:39
  #: plugins/admin/departments/locality.tpl:28
-#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/class_departmentGeneric.inc:620
  #: plugins/admin/departments/class_organizationGeneric.inc:121
  #: plugins/admin/departments/class_divListDepartment.inc:85
  #: plugins/admin/acl/class_divListACL.inc:102
  #: plugins/admin/acl/acl_role.tpl:27 plugins/admin/acl/class_aclRole.inc:734
  #: plugins/admin/ogroups/generic.tpl:26
  #: plugins/admin/ogroups/class_divListOGroup.inc:146
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1127
  #: plugins/admin/users/class_divListUsers.inc:113
  #: plugins/admin/groups/generic.tpl:39
  #: plugins/admin/groups/class_groupGeneric.inc:1263
  #: plugins/admin/groups/class_divListGroup.inc:121
  #: plugins/personal/generic/generic.tpl:170
-#: plugins/personal/generic/class_user.inc:1561
+#: plugins/personal/generic/class_user.inc:1563
  #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
  msgid "Base"
  msgstr "位置"
@@ -1280,60 +1276,60 @@ msgstr "用这个语法过滤条目"
  msgid "Please fix the above error and reload the page."
  msgstr "请看一下 GOsa 日志文件。"
  
-#: include/functions.inc:119
+#: include/functions.inc:120
  #, php-format
  msgid "Fatal error: no class locations defined - please run '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:126
+#: include/functions.inc:127
  #, php-format
  msgid ""
  "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
  msgstr ""
  
-#: include/functions.inc:335
+#: include/functions.inc:336
  #: plugins/admin/departments/class_departmentGeneric.inc:386
  #: html/password.php:58 html/main.php:147
  #, fuzzy
  msgid "Fatal error"
  msgstr "终端服务器"
  
-#: include/functions.inc:336
+#: include/functions.inc:337
  #, php-format
  msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
  msgstr "致命错误：连接 LDAP 错误。服务器返回 '%s'。"
  
-#: include/functions.inc:397
+#: include/functions.inc:398
  #, fuzzy
  msgid "Username / UID is not unique inside the LDAP tree!"
  msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
  
-#: include/functions.inc:466
+#: include/functions.inc:467
  #, fuzzy
  msgid ""
  "Username / UID is not unique inside the LDAP tree. Please contact your "
  "Administrator."
  msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
  
-#: include/functions.inc:629 include/functions.inc:730
+#: include/functions.inc:627 include/functions.inc:724
  msgid "Error while adding a lock. Contact the developers!"
  msgstr ""
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid ""
  "Cannot create locking information in LDAP tree. Please contact your "
  "administrator!"
  msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目！"
  
-#: include/functions.inc:639
+#: include/functions.inc:637
  #, fuzzy, php-format
  msgid "LDAP server returned: %s"
  msgstr "LDAP 服务器"
  
-#: include/functions.inc:751 include/functions.inc:2198
-#: include/functions.inc:2202 include/functions.inc:2208
-#: include/class_tabs.inc:248 plugins/admin/departments/remove.tpl:2
+#: include/functions.inc:745 include/functions.inc:2192
+#: include/functions.inc:2196 include/functions.inc:2202
+#: include/class_tabs.inc:259 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:630
@@ -1342,206 +1338,206 @@ msgstr "LDAP 服务器"
  #: plugins/personal/posix/class_posixAccount.inc:925 html/password.php:280
  #: html/index.php:57 html/index.php:63 html/index.php:415 html/index.php:421
  #: setup/setup_checks.tpl:32 setup/setup_checks.tpl:93
-#: setup/class_setupStep_Migrate.inc:245 setup/class_setupStep_Migrate.inc:297
-#: setup/class_setupStep_Migrate.inc:430 setup/class_setupStep_Migrate.inc:507
-#: setup/class_setupStep_Migrate.inc:646 setup/class_setupStep_Migrate.inc:787
-#: setup/class_setupStep_Migrate.inc:2259
-#: setup/class_setupStep_Migrate.inc:2412
-#: setup/class_setupStep_Migrate.inc:2744 ihtml/themes/default/conflict.tpl:6
+#: setup/class_setupStep_Migrate.inc:251 setup/class_setupStep_Migrate.inc:303
+#: setup/class_setupStep_Migrate.inc:436 setup/class_setupStep_Migrate.inc:513
+#: setup/class_setupStep_Migrate.inc:652 setup/class_setupStep_Migrate.inc:793
+#: setup/class_setupStep_Migrate.inc:2383
+#: setup/class_setupStep_Migrate.inc:2536
+#: setup/class_setupStep_Migrate.inc:2868 ihtml/themes/default/conflict.tpl:6
  #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/msg_dialog.tpl:54
  #: ihtml/themes/default/msg_dialog.tpl:97
  msgid "Warning"
  msgstr "警告"
  
-#: include/functions.inc:751
+#: include/functions.inc:745
  #, fuzzy
  msgid ""
  "Found multiple locks for object to be locked. This should not happen - "
  "cleaning up multiple references."
  msgstr "发现要锁定的对象由多个锁。这虽然不可能──清除多个引用。"
  
-#: include/functions.inc:1041
+#: include/functions.inc:1035
  #, php-format
  msgid "The size limit of %d entries is exceed!"
  msgstr "超过了 %d 个条目的大小限制！"
  
-#: include/functions.inc:1043
+#: include/functions.inc:1037
  #, 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:1055 plugins/personal/generic/generic.tpl:232
+#: include/functions.inc:1049 plugins/personal/generic/generic.tpl:232
  msgid "Configure"
  msgstr "配置"
  
-#: include/functions.inc:1060
+#: include/functions.inc:1054
  msgid "incomplete"
  msgstr "不完整"
  
-#: include/functions.inc:1342
+#: include/functions.inc:1336
  msgid "Continue anyway"
  msgstr "仍然继续"
  
-#: include/functions.inc:1344
+#: include/functions.inc:1338
  msgid "Edit anyway"
  msgstr "仍然编辑"
  
-#: include/functions.inc:1346
+#: include/functions.inc:1340
  #, fuzzy, php-format
  msgid "You're going to edit the LDAP entry/entries %s"
  msgstr "您将要拷贝条目 '%s'。"
  
-#: include/functions.inc:1530
+#: include/functions.inc:1524
  msgid "Entries per page"
  msgstr "每页条目数"
  
-#: include/functions.inc:1558
+#: include/functions.inc:1552
  msgid "Apply filter"
  msgstr "应用过滤器"
  
-#: include/functions.inc:1800
+#: include/functions.inc:1794
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1844
+#: include/functions.inc:1838
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "GOsa 开发版（版本 %s）"
  
-#: include/functions.inc:1923
+#: include/functions.inc:1917
  #, php-format
  msgid "File '%s' could not be deleted."
  msgstr ""
  
-#: include/functions.inc:1957 include/functions.inc:1977
+#: include/functions.inc:1951 include/functions.inc:1971
  #, fuzzy
  msgid "Cannot write to revision file!"
  msgstr "无法创建文件 '%s'。"
  
-#: include/functions.inc:2198 include/functions.inc:2202
-#: include/functions.inc:2208
+#: include/functions.inc:2192 include/functions.inc:2196
+#: include/functions.inc:2202
  #, fuzzy
  msgid "'baseIdHook' is not available. Using default base!"
  msgstr "警告： nextIdHook不可用。使用缺省 base。"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "LDAP warning"
  msgstr "LDAP 管理"
  
-#: include/functions.inc:2230
+#: include/functions.inc:2224
  #, fuzzy
  msgid "Cannot get schema information from server. No schema check possible!"
  msgstr "不能从服务器得到 schema 信息。无法对 schema 检查！"
  
-#: include/functions.inc:2256
+#: include/functions.inc:2250
  msgid "Used to store account specific informations."
  msgstr ""
  
-#: include/functions.inc:2263
+#: include/functions.inc:2257
  msgid ""
  "Used to lock currently edited entries to avoid multiple changes at the same "
  "time."
  msgstr ""
  
-#: include/functions.inc:2306
+#: include/functions.inc:2300
  #, php-format
  msgid "Missing required object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2308
+#: include/functions.inc:2302
  #, php-format
  msgid "Missing optional object class '%s'!"
  msgstr ""
  
-#: include/functions.inc:2314
+#: include/functions.inc:2308
  #, php-format
  msgid "Version mismatch for required object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2316
+#: include/functions.inc:2310
  #, php-format
  msgid "Version mismatch for optional object class '%s' (!=%s)!"
  msgstr ""
  
-#: include/functions.inc:2320
+#: include/functions.inc:2314
  #, fuzzy, php-format
  msgid "Class(es) available"
  msgstr "文件可用。"
  
-#: include/functions.inc:2342
+#: include/functions.inc:2336
  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:2343
+#: include/functions.inc:2337
  msgid ""
  "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
  "be      AUXILIARY"
  msgstr ""
  
-#: include/functions.inc:2347
+#: include/functions.inc:2341
  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:2348
+#: include/functions.inc:2342
  msgid "The objectClass 'posixGroup' must be STRUCTURAL"
  msgstr ""
  
-#: include/functions.inc:2372
+#: include/functions.inc:2366
  msgid "German"
  msgstr "德语"
  
-#: include/functions.inc:2373
+#: include/functions.inc:2367
  msgid "French"
  msgstr "法语"
  
-#: include/functions.inc:2374
+#: include/functions.inc:2368
  msgid "Italian"
  msgstr "意大利语"
  
-#: include/functions.inc:2375
+#: include/functions.inc:2369
  msgid "Spanish"
  msgstr "西班牙语"
  
-#: include/functions.inc:2376
+#: include/functions.inc:2370
  msgid "English"
  msgstr "英语"
  
-#: include/functions.inc:2377
+#: include/functions.inc:2371
  msgid "Dutch"
  msgstr "荷兰语"
  
-#: include/functions.inc:2378
+#: include/functions.inc:2372
  msgid "Polish"
  msgstr "波兰语"
  
-#: include/functions.inc:2380
+#: include/functions.inc:2374
  msgid "Chinese"
  msgstr "芯片组"
  
-#: include/functions.inc:2381
+#: include/functions.inc:2375
  #, fuzzy
  msgid "Vietnamese"
  msgstr "名"
  
-#: include/functions.inc:2382
+#: include/functions.inc:2376
  msgid "Russian"
  msgstr "俄语"
  
-#: include/functions.inc:2563
+#: include/functions.inc:2554
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr "命令 '%s'，作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
  
-#: include/functions.inc:2596
+#: include/functions.inc:2588
  msgid "Cannot generate samba hash!"
  msgstr ""
  
@@ -1602,7 +1598,7 @@ msgstr "类型"
  msgid "Arguments"
  msgstr "参数"
  
-#: include/password-methods/class_password-methods.inc:154
+#: include/password-methods/class_password-methods.inc:250
  msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
@@ -1656,7 +1652,7 @@ msgstr ""
  msgid "You're about to delete the snapshot '%s'."
  msgstr "您将要删除宏 '%s'。"
  
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1972
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:1983
  msgid "Restore snapshot"
  msgstr ""
  
@@ -1682,33 +1678,33 @@ msgstr ""
  #: plugins/admin/departments/organization.tpl:19
  #: plugins/admin/departments/locality.tpl:19
  #: plugins/admin/departments/class_departmentGeneric.inc:317
-#: plugins/admin/departments/class_departmentGeneric.inc:621
+#: plugins/admin/departments/class_departmentGeneric.inc:618
  #: plugins/admin/departments/class_organizationGeneric.inc:91
  #: plugins/admin/departments/class_organizationGeneric.inc:119
  #: plugins/admin/acl/acl_role.tpl:17 plugins/admin/acl/class_aclRole.inc:735
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:1125
+#: plugins/admin/ogroups/class_ogroup.inc:1128
  #: plugins/admin/groups/generic.tpl:24
  #: plugins/admin/groups/class_groupGeneric.inc:1262
  #: plugins/generic/references/contents.tpl:11
  msgid "Description"
  msgstr "描述"
  
-#: include/class_plugin.inc:504
+#: include/class_plugin.inc:510
  msgid ""
  "The object has changed since opened in GOsa. All changes that may be done by "
  "others get lost if you save this entry!"
  msgstr ""
  
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1325
+#: include/class_plugin.inc:1322 include/class_plugin.inc:1334
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_plugin.inc:1520 include/class_plugin.inc:1532
-#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1530 include/class_plugin.inc:1542
+#: include/class_plugin.inc:1557 include/class_plugin.inc:1570
  #: plugins/admin/acl/class_aclManagement.inc:268
  #: plugins/admin/ogroups/class_ogroupManagement.inc:237
  #: plugins/admin/users/class_userManagement.inc:344
@@ -1718,69 +1714,69 @@ msgstr ""
  msgid "Permission"
  msgstr "允许"
  
-#: include/class_plugin.inc:1520
+#: include/class_plugin.inc:1530
  #, fuzzy, php-format
  msgid "You are not allowed to create a snapshot for %s."
  msgstr "您无权删除这个用户！"
  
-#: include/class_plugin.inc:1532 include/class_plugin.inc:1547
-#: include/class_plugin.inc:1559
+#: include/class_plugin.inc:1542 include/class_plugin.inc:1557
+#: include/class_plugin.inc:1570
  #, fuzzy, php-format
  msgid "You are not allowed to restore a snapshot for %s."
  msgstr "您无权删除这个用户！"
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "Changing ACL dn"
  msgstr ""
  
-#: include/class_plugin.inc:1771
+#: include/class_plugin.inc:1782
  msgid "from"
  msgstr "从"
  
-#: include/class_plugin.inc:1772 setup/class_setupStep_Migrate.inc:1139
-#: setup/class_setupStep_Migrate.inc:1189
-#: setup/class_setupStep_Migrate.inc:1237
+#: include/class_plugin.inc:1783 setup/class_setupStep_Migrate.inc:1235
+#: setup/class_setupStep_Migrate.inc:1285
+#: setup/class_setupStep_Migrate.inc:1333
  #, fuzzy
  msgid "to"
  msgstr "停止"
  
-#: include/class_plugin.inc:1954 include/class_plugin.inc:1956
+#: include/class_plugin.inc:1965 include/class_plugin.inc:1967
  #, fuzzy
  msgid "Restore"
  msgstr "仓库"
  
-#: include/class_plugin.inc:1979
+#: include/class_plugin.inc:1990
  #, fuzzy
  msgid "Create snapshot"
  msgstr "创建 nagios 账户"
  
-#: include/class_plugin.inc:1980
+#: include/class_plugin.inc:1991
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "创建新 FAI 对象"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "cut"
  msgstr "剪切"
  
-#: include/class_plugin.inc:1998
+#: include/class_plugin.inc:2009
  msgid "Cut this entry"
  msgstr "剪切条目"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "copy"
  msgstr "复制"
  
-#: include/class_plugin.inc:2006
+#: include/class_plugin.inc:2017
  msgid "Copy this entry"
  msgstr "拷贝条目"
  
-#: include/class_plugin.inc:2040
+#: include/class_plugin.inc:2051
  #, fuzzy
  msgid "Copy"
  msgstr "复制"
  
-#: include/class_plugin.inc:2044
+#: include/class_plugin.inc:2055
  #, fuzzy
  msgid "Cut"
  msgstr "剪切"
@@ -1800,19 +1796,19 @@ msgstr "口令过期截止日"
  msgid "The user password was resetted, please set a new password value!"
  msgstr "您的口令已经过期 !! 选择一个新口令"
  
-#: include/class_tabs.inc:49
+#: include/class_tabs.inc:51
  #, fuzzy, php-format
  msgid ""
  "No plugin definitions found to initialize '%s', please check your "
  "configuration file."
  msgstr "无法连接到指定数据库，请检查您 glpi 设置。"
  
-#: include/class_tabs.inc:248
+#: include/class_tabs.inc:259
  #, php-format
  msgid "Delete process has been canceled by plugin '%s': %s"
  msgstr "删除进程被插件 '%s' 取消: %s"
  
-#: include/class_tabs.inc:383
+#: include/class_tabs.inc:394
  msgid "References"
  msgstr "参考"
  
@@ -1845,12 +1841,12 @@ msgstr "参考"
  #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
  #: plugins/admin/acl/class_aclRole.inc:733
  #: plugins/admin/acl/class_aclRole.inc:745
-#: plugins/admin/ogroups/class_ogroup.inc:916
-#: plugins/admin/ogroups/class_ogroup.inc:926
-#: plugins/admin/ogroups/class_ogroup.inc:1123
-#: plugins/admin/users/class_userManagement.inc:775
-#: plugins/admin/users/class_userManagement.inc:849
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/ogroups/class_ogroup.inc:919
+#: plugins/admin/ogroups/class_ogroup.inc:929
+#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:828
+#: plugins/admin/users/class_userManagement.inc:840
  #: plugins/admin/groups/class_groupGeneric.inc:1096
  #: plugins/admin/groups/class_groupGeneric.inc:1102
  #: plugins/admin/groups/class_groupGeneric.inc:1104
@@ -1859,17 +1855,17 @@ msgstr "参考"
  #: plugins/admin/groups/class_groupGeneric.inc:1137
  #: plugins/admin/groups/class_groupGeneric.inc:1261
  #: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/personal/generic/class_user.inc:1228
-#: plugins/personal/generic/class_user.inc:1241
-#: plugins/personal/generic/class_user.inc:1278
-#: plugins/personal/generic/class_user.inc:1684 setup/setup_feedback.tpl:22
-#: setup/setup_migrate.tpl:209
+#: plugins/personal/generic/class_user.inc:1230
+#: plugins/personal/generic/class_user.inc:1243
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1686 setup/setup_feedback.tpl:22
+#: setup/setup_migrate.tpl:255
  msgid "Name"
  msgstr "名称"
  
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
-#: plugins/admin/departments/class_departmentManagement.inc:556
+#: plugins/admin/departments/class_departmentManagement.inc:568
  msgid "Country"
  msgstr "国家"
  
@@ -1887,7 +1883,7 @@ msgstr "国家"
  #: plugins/admin/departments/country.tpl:50
  #: plugins/admin/departments/organization.tpl:114
  #: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/class_departmentGeneric.inc:631
+#: plugins/admin/departments/class_departmentGeneric.inc:628
  #: plugins/admin/departments/class_organizationGeneric.inc:129
  msgid "Administrative settings"
  msgstr "管理设置"
@@ -1952,7 +1948,7 @@ msgstr "将部门标记为独立的管理单元"
  
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:544
+#: plugins/admin/departments/class_departmentManagement.inc:556
  #, fuzzy
  msgid "Domain Component"
  msgstr "域管理员"
@@ -1967,7 +1963,7 @@ msgstr "要创建子树的名称"
  
  #: plugins/admin/departments/generic.tpl:27
  #: plugins/admin/departments/organization.tpl:27
-#: plugins/admin/departments/class_departmentGeneric.inc:622
+#: plugins/admin/departments/class_departmentGeneric.inc:619
  #: plugins/admin/departments/class_organizationGeneric.inc:120
  msgid "Category"
  msgstr "分类"
@@ -1982,20 +1978,20 @@ msgstr "这个子树的分类"
  #: plugins/admin/departments/class_localityGeneric.inc:87
  #: plugins/admin/departments/organization.tpl:61
  #: plugins/admin/departments/organization.tpl:73
-#: plugins/admin/departments/class_departmentGeneric.inc:626
+#: plugins/admin/departments/class_departmentGeneric.inc:623
  #: plugins/admin/departments/class_organizationGeneric.inc:124
  #: plugins/personal/generic/generic.tpl:381
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1580
  #: plugins/personal/generic/multiple_generic.tpl:265
  msgid "Location"
  msgstr "位置"
  
  #: plugins/admin/departments/generic.tpl:65
  #: plugins/admin/departments/organization.tpl:65
-#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/class_departmentGeneric.inc:622
  #: plugins/admin/departments/class_organizationGeneric.inc:123
  #: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1579
  #: plugins/personal/generic/multiple_generic.tpl:275
  msgid "State"
  msgstr "州/省"
@@ -2012,7 +2008,7 @@ msgstr "这个子树的位置"
  
  #: plugins/admin/departments/generic.tpl:81
  #: plugins/admin/departments/organization.tpl:81
-#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/class_departmentGeneric.inc:624
  #: plugins/personal/generic/generic.tpl:194
  #: plugins/personal/generic/generic.tpl:397
  #: plugins/personal/generic/multiple_generic.tpl:67
@@ -2028,13 +2024,13 @@ msgstr "这个子树的地址"
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/organization.tpl:88
  #: plugins/admin/departments/class_departmentGeneric.inc:328
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
  #: plugins/admin/users/class_divListUsers.inc:207
  #: plugins/admin/groups/class_divListGroup.inc:196
  #: plugins/personal/generic/generic.tpl:338
  #: plugins/personal/generic/generic.tpl:519
-#: plugins/personal/generic/class_user.inc:1261
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1263
+#: plugins/personal/generic/class_user.inc:1671
  #: plugins/personal/generic/multiple_generic.tpl:217
  #: plugins/personal/generic/multiple_generic.tpl:428
  #: plugins/generic/references/class_reference.inc:61
@@ -2049,13 +2045,13 @@ msgstr "这个子树的电话号码"
  #: plugins/admin/departments/generic.tpl:96
  #: plugins/admin/departments/organization.tpl:96
  #: plugins/admin/departments/class_departmentGeneric.inc:331
-#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/class_departmentGeneric.inc:626
  #: plugins/admin/departments/class_organizationGeneric.inc:127
  #: plugins/admin/users/class_divListUsers.inc:209
  #: plugins/personal/generic/generic.tpl:363
  #: plugins/personal/generic/generic.tpl:531
-#: plugins/personal/generic/class_user.inc:1264
-#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1266
+#: plugins/personal/generic/class_user.inc:1674
  #: plugins/personal/generic/multiple_generic.tpl:247
  #: plugins/personal/generic/multiple_generic.tpl:438
  msgid "Fax"
@@ -2067,8 +2063,8 @@ msgid "Base facsimile telephone number of this subtree"
  msgstr "这个子树的传真号码"
  
  #: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/departments/class_departmentGeneric.inc:612
-#: plugins/admin/departments/class_departmentGeneric.inc:617
+#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/departments/class_departmentGeneric.inc:614
  msgid "Departments"
  msgstr "部门"
  
@@ -2077,7 +2073,7 @@ msgstr "部门"
  msgid "Manage Departments"
  msgstr "部门"
  
-#: plugins/admin/departments/class_departmentManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:250
  #: plugins/admin/acl/class_aclManagement.inc:166
  #: plugins/admin/acl/class_aclManagement.inc:209
  #: plugins/admin/acl/class_aclManagement.inc:302
@@ -2094,44 +2090,44 @@ msgstr "部门"
  msgid "Permission error"
  msgstr "允许"
  
-#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/departments/class_departmentManagement.inc:316
  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:325
+#: plugins/admin/departments/class_departmentManagement.inc:336
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
  "page and press the 'Continue' button to continue with the department "
  "management dialog."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:580
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
  msgid "Locality"
  msgstr "位置"
  
-#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_departmentManagement.inc:592
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/generic.tpl:279
-#: plugins/personal/generic/class_user.inc:1565
+#: plugins/personal/generic/class_user.inc:1567
  #: plugins/personal/generic/multiple_generic.tpl:149
  #: setup/setup_feedback.tpl:14
  msgid "Organization"
  msgstr "组织/公司"
  
-#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_departmentManagement.inc:604
  #: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_ogroupManagement.inc:529
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
  #: plugins/admin/users/class_divListUsers.inc:80
  #: plugins/admin/groups/class_divListGroup.inc:79
  #: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/class_user.inc:1566
+#: plugins/personal/generic/class_user.inc:1568
  #: plugins/personal/generic/multiple_generic.tpl:159
  #: plugins/generic/references/class_reference.inc:59
  msgid "Department"
@@ -2210,59 +2206,59 @@ msgstr "您的浏览器不支持 iframe，请使用这个链接来执行请求
  msgid "Cannot find an unused tag for this administrative unit!"
  msgstr "致命错误：无法找到一个未使用的标志来标记管理单元！"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:456
  #, php-format
  msgid "Tagging '%s'."
  msgstr "标记 '%s'。"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:516
-#: plugins/admin/departments/class_departmentGeneric.inc:598
+#: plugins/admin/departments/class_departmentGeneric.inc:513
+#: plugins/admin/departments/class_departmentGeneric.inc:595
  #: plugins/admin/users/template.tpl:48
  #: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "继续"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/departments/class_departmentGeneric.inc:537
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "移动 '%s' 到 '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:581
+#: plugins/admin/departments/class_departmentGeneric.inc:578
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "拷贝 %s 失败，退出操作"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:611
-#: plugins/admin/ogroups/class_ogroup.inc:1114
+#: plugins/admin/departments/class_departmentGeneric.inc:608
+#: plugins/admin/ogroups/class_ogroup.inc:1117
  #: plugins/admin/groups/class_groupGeneric.inc:1252
  #: plugins/personal/posix/generic.tpl:4
  #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1541
+#: plugins/personal/generic/class_user.inc:1543
  #: plugins/generic/references/class_reference.inc:41
  #: setup/setup_feedback.tpl:46
  msgid "Generic"
  msgstr "通用配置"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/class_departmentGeneric.inc:617
  #: plugins/admin/departments/class_divListDepartment.inc:65
  msgid "Department name"
  msgstr "部门名称"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:628
+#: plugins/admin/departments/class_departmentGeneric.inc:625
  msgid "Telephone"
  msgstr "电话"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:682
+#: plugins/admin/departments/class_departmentGeneric.inc:679
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "对象 '%s' 已经做标记"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:689
+#: plugins/admin/departments/class_departmentGeneric.inc:686
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "添加标识（%s）到对象 '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:721
+#: plugins/admin/departments/class_departmentGeneric.inc:718
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "从对象 '%s' 删除标记"
@@ -2273,7 +2269,7 @@ msgid "Organization name"
  msgstr "组织/公司"
  
  #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1581
  msgid "Postal address"
  msgstr "地址"
  
@@ -2292,9 +2288,9 @@ msgstr "部门列表"
  #: 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:294 setup/setup_migrate.tpl:347
-#: setup/setup_migrate.tpl:390 setup/setup_migrate.tpl:433
-#: setup/setup_migrate.tpl:477
+#: setup/setup_migrate.tpl:340 setup/setup_migrate.tpl:393
+#: setup/setup_migrate.tpl:436 setup/setup_migrate.tpl:479
+#: setup/setup_migrate.tpl:523
  #, fuzzy
  msgid "Select all"
  msgstr "选择"
@@ -2330,7 +2326,8 @@ msgstr "提交部门"
  #: plugins/admin/ogroups/class_divListOGroup.inc:157
  #: plugins/admin/users/class_divListUsers.inc:124
  #: plugins/admin/groups/class_divListGroup.inc:131
-#: setup/class_setupStep_Migrate.inc:944
+#: setup/class_setupStep_Migrate.inc:1024
+#: setup/class_setupStep_Migrate.inc:1040
  msgid "Create"
  msgstr "创建"
  
@@ -2342,7 +2339,7 @@ msgstr "创建"
  #: plugins/personal/generic/generic_certs.tpl:21
  #: plugins/personal/generic/generic_certs.tpl:45
  #: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2556
+#: setup/class_setupStep_Migrate.inc:2680
  msgid "Remove"
  msgstr "删除"
  
@@ -2407,7 +2404,7 @@ msgstr "显示匹配的宏"
  #: plugins/admin/acl/class_divListACL.inc:152
  #: plugins/admin/acl/class_aclRole.inc:725
  #: plugins/personal/generic/generic.tpl:448
-#: plugins/personal/generic/class_user.inc:1537
+#: plugins/personal/generic/class_user.inc:1539
  #: plugins/personal/generic/multiple_generic.tpl:345
  msgid "Role"
  msgstr "角色"
@@ -2579,15 +2576,15 @@ msgid "Object group"
  msgstr "对象组"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:88
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:489
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:85
  #: plugins/admin/users/class_divListUsers.inc:86
@@ -2671,8 +2668,7 @@ msgid "Regular expression for matching group names"
  msgstr "用于匹配组名的正则表达式"
  
  #: plugins/admin/ogroups/class_divListOGroup.inc:204
-#: plugins/admin/ogroups/tabs_ogroups.inc:134
-#: plugins/admin/ogroups/tabs_ogroups.inc:327
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
  #: plugins/admin/users/class_divListUsers.inc:87
  #: plugins/admin/users/class_divListUsers.inc:205
  #: plugins/admin/groups/class_divListGroup.inc:190
@@ -2696,41 +2692,37 @@ msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的
  msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
  msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:119
-#: plugins/admin/ogroups/tabs_ogroups.inc:318
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
  msgid "Phone queue"
  msgstr "电话队列"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:145
-#: plugins/admin/ogroups/tabs_ogroups.inc:286
+#: plugins/admin/ogroups/tabs_ogroups.inc:160
  #, fuzzy
  msgid "Systems"
  msgstr "系统"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:155
-#: plugins/admin/ogroups/tabs_ogroups.inc:176
-#: plugins/admin/ogroups/tabs_ogroups.inc:291
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/tabs_ogroups.inc:194
  msgid "Startup"
  msgstr "启动"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:165
-#: plugins/admin/ogroups/tabs_ogroups.inc:184
-#: plugins/admin/ogroups/tabs_ogroups.inc:295
+#: plugins/admin/ogroups/tabs_ogroups.inc:182
+#: plugins/admin/ogroups/tabs_ogroups.inc:203
  msgid "Devices"
  msgstr "设备"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:193
+#: plugins/admin/ogroups/tabs_ogroups.inc:213
  msgid "FAI summary"
  msgstr "自动化安装说明"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:202
+#: plugins/admin/ogroups/tabs_ogroups.inc:222
  #: plugins/admin/users/class_divListUsers.inc:203
  #: plugins/admin/groups/class_divListGroup.inc:198
  #: plugins/personal/posix/class_posixAccount.inc:295
  msgid "Environment"
  msgstr "环境设置"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:221
+#: plugins/admin/ogroups/tabs_ogroups.inc:241
  msgid "Applications"
  msgstr "应用程序"
  
@@ -2769,7 +2761,7 @@ msgstr "匹配对象名的正则表达式"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:26
  #: plugins/admin/ogroups/main.inc:46 plugins/admin/ogroups/main.inc:51
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:1123
  msgid "Object groups"
  msgstr "对象组"
  
@@ -2791,45 +2783,45 @@ msgstr "PHP 错误"
  msgid "object group"
  msgstr "对象组"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
  #: plugins/admin/users/class_divListUsers.inc:126 setup/setup_config2.tpl:286
  #: setup/setup_config2.tpl:331
  msgid "User"
  msgstr "用户"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
  #: plugins/admin/groups/class_divListGroup.inc:133
  #: plugins/generic/references/class_reference.inc:57
  msgid "Group"
  msgstr "组"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:528
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
  #: plugins/admin/groups/class_divListGroup.inc:194
  #: plugins/generic/references/class_reference.inc:63
  msgid "Application"
  msgstr "应用程序"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
  #: plugins/generic/references/class_reference.inc:65
  #: setup/setup_config2.tpl:277 setup/setup_config2.tpl:322
  msgid "Server"
  msgstr "服务器"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
  #: plugins/generic/references/class_reference.inc:69
  msgid "Workstation"
  msgstr "工作站"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
  #, fuzzy
  msgid "Windows Install"
  msgstr "Windows 工作站"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
  msgid "Terminal"
  msgstr "终端"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
  #: plugins/generic/references/class_reference.inc:73
  msgid "Printer"
  msgstr "打印机"
@@ -2846,121 +2838,128 @@ msgstr "提示信息"
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:451
-#: plugins/admin/ogroups/class_ogroup.inc:453
-#: plugins/admin/ogroups/class_ogroup.inc:511
+#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:517
  msgid "departments"
  msgstr "部门"
  
-#: plugins/admin/ogroups/class_ogroup.inc:455
-#: plugins/admin/ogroups/class_ogroup.inc:457
+#: plugins/admin/ogroups/class_ogroup.inc:461
+#: plugins/admin/ogroups/class_ogroup.inc:463
  #, fuzzy
  msgid "people"
  msgstr "显示人员"
  
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:509
+#: plugins/admin/ogroups/class_ogroup.inc:465
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:515
  msgid "groups"
  msgstr "组"
  
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:469
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:518
  msgid "servers"
  msgstr "服务器"
  
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:513
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:519
  msgid "workstations"
  msgstr "工作站"
  
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:477
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:521
  msgid "terminals"
  msgstr "终端"
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:481
  #, fuzzy
  msgid "printer"
  msgstr "打印机"
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:523
  msgid "printers"
  msgstr "打印机"
  
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:481
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:485
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:522
  msgid "phones"
  msgstr "电话"
  
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:489
-#: plugins/admin/ogroups/class_ogroup.inc:510
+#: plugins/admin/ogroups/class_ogroup.inc:493
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/ogroups/class_ogroup.inc:516
  msgid "applications"
  msgstr "应用程序"
  
-#: plugins/admin/ogroups/class_ogroup.inc:504
+#: plugins/admin/ogroups/class_ogroup.inc:510
  #: plugins/admin/users/class_userManagement.inc:492
  msgid "none"
  msgstr "无"
  
-#: plugins/admin/ogroups/class_ogroup.inc:506
+#: plugins/admin/ogroups/class_ogroup.inc:512
  msgid "too many different objects!"
  msgstr "太多不同对象！"
  
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:514
  msgid "users"
  msgstr "用户"
  
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:520
  #, fuzzy
  msgid "winstations"
  msgstr "Windows 工作站"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  #: setup/setup_config2.tpl:201
  msgid "disabled"
  msgstr "禁用"
  
-#: plugins/admin/ogroups/class_ogroup.inc:564
+#: plugins/admin/ogroups/class_ogroup.inc:570
  #: plugins/admin/groups/class_groupGeneric.inc:521
  #: plugins/personal/posix/class_posixAccount.inc:623
  msgid "full access"
  msgstr "完全访问权限"
  
-#: plugins/admin/ogroups/class_ogroup.inc:565
+#: plugins/admin/ogroups/class_ogroup.inc:571
  #: plugins/admin/groups/class_groupGeneric.inc:522
  #: plugins/personal/posix/class_posixAccount.inc:624
  msgid "allow access to these hosts"
  msgstr "允许访问这些主机"
  
-#: plugins/admin/ogroups/class_ogroup.inc:747
+#: plugins/admin/ogroups/class_ogroup.inc:755
  msgid "Non existing dn:"
  msgstr "不存在的 dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:931
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:934
  #, fuzzy
  msgid "You can combine two different object types at maximum, only!"
  msgstr "您最多只能组合两个不同的对象类！"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1115
+#: plugins/admin/ogroups/class_ogroup.inc:1118
  #, fuzzy
  msgid "Object group generic"
  msgstr "对象组"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1126
+#: plugins/admin/ogroups/class_ogroup.inc:1129
  #, fuzzy
  msgid "Sytem trust"
  msgstr "信赖的系统"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1127
+#: plugins/admin/ogroups/class_ogroup.inc:1130
  #, fuzzy
  msgid "Member"
  msgstr "成员"
@@ -3005,7 +3004,7 @@ msgstr "修改口令将影响邮件，代理，samba，unix等的登录。"
  #: plugins/admin/users/password.tpl:13
  #: plugins/admin/users/class_userManagement.inc:265
  #: plugins/personal/generic/password.tpl:7
-#: plugins/personal/generic/main.inc:86
+#: plugins/personal/generic/main.inc:91
  #: plugins/personal/password/password.tpl:18 html/password.php:196
  #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
  #: ihtml/themes/default/accountexpired.tpl:32
@@ -3043,7 +3042,7 @@ msgstr "用户名"
  
  #: plugins/admin/users/class_divListUsers.inc:84
  #: plugins/admin/users/class_divListUsers.inc:128
-#: plugins/admin/users/class_userManagement.inc:772
+#: plugins/admin/users/class_userManagement.inc:751
  #: plugins/admin/users/template.tpl:15 plugins/admin/users/templatize.tpl:15
  msgid "Template"
  msgstr "模板"
@@ -3211,7 +3210,7 @@ msgid "Manage users"
  msgstr "域用户"
  
  #: plugins/admin/users/class_userManagement.inc:260
-#: plugins/personal/generic/main.inc:81
+#: plugins/personal/generic/main.inc:86
  #: plugins/personal/password/class_password.inc:82 html/password.php:193
  msgid ""
  "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -3220,7 +3219,7 @@ msgstr "您输入的“新口令”和“重复新口令”不匹配。"
  
  #: plugins/admin/users/class_userManagement.inc:316
  #: plugins/admin/users/class_userManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:651
  #: plugins/personal/password/class_password.inc:78
  #: plugins/personal/password/class_password.inc:81
  #: plugins/personal/password/class_password.inc:84
@@ -3250,17 +3249,17 @@ msgstr "您无权删除这个黑名单。"
  msgid "You have no permission to use this template!"
  msgstr "您无权删除这个黑名单。"
  
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
  #, fuzzy
  msgid "You have no permission to change the lock status for this user!"
  msgstr "您无权修改您的口令。"
  
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/users/class_userManagement.inc:852
-#: plugins/personal/generic/class_user.inc:1233
-#: plugins/personal/generic/class_user.inc:1275
-#: plugins/personal/generic/class_user.inc:1553
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:831
+#: plugins/personal/generic/class_user.inc:1235
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1683
  msgid "Given name"
  msgstr "名"
  
@@ -3302,10 +3301,10 @@ msgstr "名"
  
  #: plugins/admin/users/template.tpl:32 plugins/personal/generic/generic.tpl:82
  #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/personal/generic/class_user.inc:1223
-#: plugins/personal/generic/class_user.inc:1236
-#: plugins/personal/generic/class_user.inc:1250
-#: plugins/personal/generic/class_user.inc:1252 html/password.php:215
+#: plugins/personal/generic/class_user.inc:1225
+#: plugins/personal/generic/class_user.inc:1238
+#: plugins/personal/generic/class_user.inc:1252
+#: plugins/personal/generic/class_user.inc:1254 html/password.php:215
  msgid "Login"
  msgstr "登录名"
  
@@ -3752,13 +3751,13 @@ msgid "POSIX account"
  msgstr "GLPI 账号"
  
  #: plugins/personal/posix/class_posixAccount.inc:1516
-#: plugins/personal/generic/class_user.inc:1546
+#: plugins/personal/generic/class_user.inc:1548
  #: plugins/personal/password/class_password.inc:145
  msgid "My account"
  msgstr "我的账号"
  
  #: plugins/personal/posix/class_posixAccount.inc:1524
-#: setup/setup_migrate.tpl:217
+#: setup/setup_migrate.tpl:263
  msgid "User ID"
  msgstr "用户 ID"
  
@@ -3801,7 +3800,7 @@ msgstr "显示人员"
  msgid "System trust model"
  msgstr "信赖的系统"
  
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:136
  #, fuzzy
  msgid "POSIX settings"
  msgstr "Posix 设置"
@@ -3848,18 +3847,18 @@ msgid "Template name"
  msgstr "模板名称"
  
  #: plugins/personal/generic/generic.tpl:98
-#: plugins/personal/generic/class_user.inc:1555
+#: plugins/personal/generic/class_user.inc:1557
  msgid "Personal title"
  msgstr "个人称谓"
  
  #: plugins/personal/generic/generic.tpl:108
-#: plugins/personal/generic/class_user.inc:1556
+#: plugins/personal/generic/class_user.inc:1558
  #: plugins/personal/generic/multiple_generic.tpl:23
  msgid "Academic title"
  msgstr "学位头衔"
  
  #: plugins/personal/generic/generic.tpl:119
-#: plugins/personal/generic/class_user.inc:1558
+#: plugins/personal/generic/class_user.inc:1560
  msgid "Date of birth"
  msgstr "生日"
  
@@ -3883,9 +3882,9 @@ msgid "Private phone"
  msgstr "私人电话"
  
  #: plugins/personal/generic/generic.tpl:210
-#: plugins/personal/generic/class_user.inc:1256
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/class_user.inc:1666
+#: plugins/personal/generic/class_user.inc:1258
+#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1668
  #: plugins/personal/generic/multiple_generic.tpl:88
  msgid "Homepage"
  msgstr "个人主页"
@@ -3927,7 +3926,7 @@ msgid "Employee No."
  msgstr "员工编号"
  
  #: plugins/personal/generic/generic.tpl:311
-#: plugins/personal/generic/class_user.inc:1569
+#: plugins/personal/generic/class_user.inc:1571
  #: plugins/personal/generic/multiple_generic.tpl:189
  msgid "Employee type"
  msgstr "员工类别"
@@ -3940,69 +3939,69 @@ msgid "Room No."
  msgstr "房间号"
  
  #: plugins/personal/generic/generic.tpl:347
-#: plugins/personal/generic/class_user.inc:1267
-#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/class_user.inc:1269
+#: plugins/personal/generic/class_user.inc:1677
  #: plugins/personal/generic/multiple_generic.tpl:227
  msgid "Mobile"
  msgstr "手机"
  
  #: plugins/personal/generic/generic.tpl:355
-#: plugins/personal/generic/class_user.inc:1270
-#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1680
  #: plugins/personal/generic/multiple_generic.tpl:237
  msgid "Pager"
  msgstr "呼机"
  
  #: plugins/personal/generic/generic.tpl:413
-#: plugins/personal/generic/class_user.inc:1528
+#: plugins/personal/generic/class_user.inc:1530
  #: plugins/personal/generic/multiple_generic.tpl:302
  msgid "Vocation"
  msgstr "行业"
  
  #: plugins/personal/generic/generic.tpl:421
-#: plugins/personal/generic/class_user.inc:1531
+#: plugins/personal/generic/class_user.inc:1533
  #: plugins/personal/generic/multiple_generic.tpl:312
  msgid "Unit description"
  msgstr "单元描述"
  
  #: plugins/personal/generic/generic.tpl:430
-#: plugins/personal/generic/class_user.inc:1532
+#: plugins/personal/generic/class_user.inc:1534
  #: plugins/personal/generic/multiple_generic.tpl:323
  msgid "Subject area"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:439
-#: plugins/personal/generic/class_user.inc:1533
+#: plugins/personal/generic/class_user.inc:1535
  #: plugins/personal/generic/multiple_generic.tpl:334
  msgid "Functional title"
  msgstr "单位职称"
  
  #: plugins/personal/generic/generic.tpl:462
-#: plugins/personal/generic/class_user.inc:1530
+#: plugins/personal/generic/class_user.inc:1532
  #: plugins/personal/generic/multiple_generic.tpl:360
  msgid "Person locality"
  msgstr ""
  
  #: plugins/personal/generic/generic.tpl:471
-#: plugins/personal/generic/class_user.inc:1526
+#: plugins/personal/generic/class_user.inc:1528
  #: plugins/personal/generic/multiple_generic.tpl:371
  msgid "Unit"
  msgstr "单元"
  
  #: plugins/personal/generic/generic.tpl:480
-#: plugins/personal/generic/class_user.inc:1536
+#: plugins/personal/generic/class_user.inc:1538
  #: plugins/personal/generic/multiple_generic.tpl:382
  msgid "Street"
  msgstr "街道"
  
  #: plugins/personal/generic/generic.tpl:488
-#: plugins/personal/generic/class_user.inc:1538
+#: plugins/personal/generic/class_user.inc:1540
  #: plugins/personal/generic/multiple_generic.tpl:392
  msgid "Postal code"
  msgstr "邮编"
  
  #: plugins/personal/generic/generic.tpl:496
-#: plugins/personal/generic/class_user.inc:1527
+#: plugins/personal/generic/class_user.inc:1529
  #: plugins/personal/generic/multiple_generic.tpl:402
  msgid "House identifier"
  msgstr "家庭角色"
@@ -4012,13 +4011,13 @@ msgid "Please use the phone tab"
  msgstr "请使用电话页面"
  
  #: plugins/personal/generic/generic.tpl:540
-#: plugins/personal/generic/class_user.inc:1529
+#: plugins/personal/generic/class_user.inc:1531
  #: plugins/personal/generic/multiple_generic.tpl:449
  msgid "Last delivery"
  msgstr "最后传递"
  
  #: plugins/personal/generic/generic.tpl:549
-#: plugins/personal/generic/class_user.inc:1535
+#: plugins/personal/generic/class_user.inc:1537
  #: plugins/personal/generic/multiple_generic.tpl:460
  msgid "Public visible"
  msgstr "公开"
@@ -4029,7 +4028,7 @@ msgstr "用户设置"
  
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:295
-#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:225
+#: setup/setup_config2.tpl:340 setup/setup_migrate.tpl:271
  #: ihtml/themes/default/password.tpl:40 ihtml/themes/default/login.tpl:47
  #: ihtml/themes/default/login.tpl:49
  msgid "Password"
@@ -4044,7 +4043,7 @@ msgid "Set new password"
  msgstr "设置新密码"
  
  #: plugins/personal/generic/paste_generic.tpl:47
-#: plugins/personal/generic/class_user.inc:1563
+#: plugins/personal/generic/class_user.inc:1565
  msgid "User picture"
  msgstr "用户图片"
  
@@ -4098,115 +4097,115 @@ msgstr "无效"
  msgid "No certificate installed"
  msgstr "未安装证书"
  
-#: plugins/personal/generic/class_user.inc:602 html/password.php:159
+#: plugins/personal/generic/class_user.inc:603 html/password.php:159
  #, fuzzy
  msgid "Password method"
  msgstr "口令存储"
  
-#: plugins/personal/generic/class_user.inc:602
+#: plugins/personal/generic/class_user.inc:603
  #, fuzzy
  msgid "The selected password method is no longer available."
  msgstr "此应用程序不再可用。"
  
-#: plugins/personal/generic/class_user.inc:1194
+#: plugins/personal/generic/class_user.inc:1196
  #, fuzzy
  msgid "The selected password method requires initial configuration!"
  msgstr "此应用程序不再可用。"
  
-#: plugins/personal/generic/class_user.inc:1380
+#: plugins/personal/generic/class_user.inc:1382
  #, fuzzy
  msgid "Cannot open certificate!"
  msgstr "无法打开指定证书！"
  
-#: plugins/personal/generic/class_user.inc:1534
+#: plugins/personal/generic/class_user.inc:1536
  #: plugins/personal/generic/generic_certs.tpl:78
  msgid "Certificate serial number"
  msgstr "证书系列号"
  
-#: plugins/personal/generic/class_user.inc:1542
+#: plugins/personal/generic/class_user.inc:1544
  #, fuzzy
  msgid "Generic user settings"
  msgstr "通用队列设置"
  
-#: plugins/personal/generic/class_user.inc:1552
+#: plugins/personal/generic/class_user.inc:1554
  msgid "Surname"
  msgstr "姓"
  
-#: plugins/personal/generic/class_user.inc:1554
+#: plugins/personal/generic/class_user.inc:1556
  #, fuzzy
  msgid "User identification"
  msgstr "用户信息"
  
-#: plugins/personal/generic/class_user.inc:1559
+#: plugins/personal/generic/class_user.inc:1561
  #, fuzzy
  msgid "Gender"
  msgstr "发送者"
  
-#: plugins/personal/generic/class_user.inc:1560
+#: plugins/personal/generic/class_user.inc:1562
  #, fuzzy
  msgid "Preferred language"
  msgstr "首选语种"
  
-#: plugins/personal/generic/class_user.inc:1567
+#: plugins/personal/generic/class_user.inc:1569
  #, fuzzy
  msgid "Department number"
  msgstr "部门名称"
  
-#: plugins/personal/generic/class_user.inc:1568
+#: plugins/personal/generic/class_user.inc:1570
  #, fuzzy
  msgid "Employee number"
  msgstr "员工类别"
  
-#: plugins/personal/generic/class_user.inc:1571
+#: plugins/personal/generic/class_user.inc:1573
  #, fuzzy
  msgid "Room number"
  msgstr "电话号码"
  
-#: plugins/personal/generic/class_user.inc:1572
+#: plugins/personal/generic/class_user.inc:1574
  #, fuzzy
  msgid "Telefon number"
  msgstr "电话号码"
  
-#: plugins/personal/generic/class_user.inc:1573
+#: plugins/personal/generic/class_user.inc:1575
  #, fuzzy
  msgid "Pager number"
  msgstr "电话号码"
  
-#: plugins/personal/generic/class_user.inc:1574
+#: plugins/personal/generic/class_user.inc:1576
  #, fuzzy
  msgid "Mobile number"
  msgstr "电话号码"
  
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1577
  #, fuzzy
  msgid "Fax number"
  msgstr "系列号"
  
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1583
  msgid "Home postal address"
  msgstr "住宅地址"
  
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1584
  #, fuzzy
  msgid "Home phone number"
  msgstr "电话号码"
  
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1586
  #, fuzzy
  msgid "User password method"
  msgstr "口令存储"
  
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1587
  #, fuzzy
  msgid "User certificates"
  msgstr "编辑证书"
  
-#: plugins/personal/generic/main.inc:104
+#: plugins/personal/generic/main.inc:109
  #, fuzzy
  msgid "You have no permission to set your password!"
  msgstr "您无权修改您的口令。"
  
-#: plugins/personal/generic/main.inc:195
+#: plugins/personal/generic/main.inc:200
  msgid "Generic user information"
  msgstr "用户一般信息"
  
@@ -4294,7 +4293,7 @@ msgstr "您无权修改您的口令。"
  msgid "User password"
  msgstr "清除口令"
  
-#: plugins/personal/password/main.inc:48 setup/setup_config1.tpl:136
+#: plugins/personal/password/main.inc:47 setup/setup_config1.tpl:136
  #, fuzzy
  msgid "Password settings"
  msgstr "用户设置"
@@ -5124,7 +5123,7 @@ msgstr ""
  msgid "Completed"
  msgstr "不完整"
  
-#: setup/class_setup.inc:267 setup/setup_migrate.tpl:198
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl:244
  #, fuzzy
  msgid "Next"
  msgstr "下一个"
@@ -5405,283 +5404,298 @@ msgstr "禁用"
  msgid "Enabled"
  msgstr "禁用"
  
-#: setup/class_setupStep_Migrate.inc:118 setup/class_setupStep_Migrate.inc:119
+#: setup/class_setupStep_Migrate.inc:123 setup/class_setupStep_Migrate.inc:124
  #, fuzzy
  msgid "LDAP inspection"
  msgstr "PHP 安装检查"
  
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:125
  msgid "Analyze your current LDAP for GOsa compatibility"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:131
  #, fuzzy
  msgid "Checking for root object"
  msgstr "检查 iconv 支持"
  
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:137
  msgid "Checking permissions on LDAP database"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:143
  #, fuzzy
  msgid "Checking for invisible departments"
  msgstr "检查 iconv 支持"
  
-#: setup/class_setupStep_Migrate.inc:143
+#: setup/class_setupStep_Migrate.inc:148
  #, fuzzy
  msgid "Checking for invisible users"
  msgstr "检查 iconv 支持"
  
-#: setup/class_setupStep_Migrate.inc:149
+#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:3021
  #, fuzzy
  msgid "Checking for super administrator"
  msgstr "检查一些附加程序"
  
-#: setup/class_setupStep_Migrate.inc:155
+#: setup/class_setupStep_Migrate.inc:161
  #, fuzzy
  msgid "Checking for users outside the people tree"
  msgstr "检查 cups 模块"
  
-#: setup/class_setupStep_Migrate.inc:161
+#: setup/class_setupStep_Migrate.inc:167
  #, fuzzy
  msgid "Checking for groups outside the groups tree"
  msgstr "检查 cups 模块"
  
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:174
  msgid "Checking for windows workstations outside the winstation tree"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:174
+#: setup/class_setupStep_Migrate.inc:180
  #, fuzzy
  msgid "Checking for duplicated UID numbers"
  msgstr "检查函数 %s"
  
-#: setup/class_setupStep_Migrate.inc:180
+#: setup/class_setupStep_Migrate.inc:186
  #, fuzzy
  msgid "Checking for duplicate GID numbers"
  msgstr "检查函数 %s"
  
-#: setup/class_setupStep_Migrate.inc:186
+#: setup/class_setupStep_Migrate.inc:192
  #, fuzzy
  msgid "Checking for old style USB devices"
  msgstr "检查 iconv 支持"
  
-#: setup/class_setupStep_Migrate.inc:192
+#: setup/class_setupStep_Migrate.inc:198
  #, fuzzy
  msgid "Checking for old services that have to be migrated"
  msgstr "检查 cups 模块"
  
-#: setup/class_setupStep_Migrate.inc:198
+#: setup/class_setupStep_Migrate.inc:204
  #, fuzzy
  msgid "Checking for old style application menus"
  msgstr "检查函数 %s"
  
-#: setup/class_setupStep_Migrate.inc:224 setup/class_setupStep_Migrate.inc:276
-#: setup/class_setupStep_Migrate.inc:341 setup/class_setupStep_Migrate.inc:405
-#: setup/class_setupStep_Migrate.inc:476 setup/class_setupStep_Migrate.inc:553
-#: setup/class_setupStep_Migrate.inc:638 setup/class_setupStep_Migrate.inc:779
-#: setup/class_setupStep_Migrate.inc:868
-#: setup/class_setupStep_Migrate.inc:2192
-#: setup/class_setupStep_Migrate.inc:2383
-#: setup/class_setupStep_Migrate.inc:2520
+#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:411
+#: setup/class_setupStep_Migrate.inc:482 setup/class_setupStep_Migrate.inc:559
+#: setup/class_setupStep_Migrate.inc:644 setup/class_setupStep_Migrate.inc:785
+#: setup/class_setupStep_Migrate.inc:880
+#: setup/class_setupStep_Migrate.inc:2316
+#: setup/class_setupStep_Migrate.inc:2507
+#: setup/class_setupStep_Migrate.inc:2644
  #, fuzzy
  msgid "LDAP query failed"
  msgstr "Mysql 查询失败。"
  
-#: setup/class_setupStep_Migrate.inc:225 setup/class_setupStep_Migrate.inc:277
-#: setup/class_setupStep_Migrate.inc:342 setup/class_setupStep_Migrate.inc:406
-#: setup/class_setupStep_Migrate.inc:477 setup/class_setupStep_Migrate.inc:554
-#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:780
-#: setup/class_setupStep_Migrate.inc:869
-#: setup/class_setupStep_Migrate.inc:2193
-#: setup/class_setupStep_Migrate.inc:2384
-#: setup/class_setupStep_Migrate.inc:2521
+#: setup/class_setupStep_Migrate.inc:231 setup/class_setupStep_Migrate.inc:283
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:412
+#: setup/class_setupStep_Migrate.inc:483 setup/class_setupStep_Migrate.inc:560
+#: setup/class_setupStep_Migrate.inc:645 setup/class_setupStep_Migrate.inc:786
+#: setup/class_setupStep_Migrate.inc:881
+#: setup/class_setupStep_Migrate.inc:2317
+#: setup/class_setupStep_Migrate.inc:2508
+#: setup/class_setupStep_Migrate.inc:2645
  msgid "Possibly the 'root object' is missing."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:247
+#: setup/class_setupStep_Migrate.inc:253
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'uidNumber'."
  msgstr "发现记录类型 '%s' 有重复。"
  
-#: setup/class_setupStep_Migrate.inc:299
+#: setup/class_setupStep_Migrate.inc:305
  #, fuzzy, php-format
  msgid "Found %s duplicate values for attribute 'gidNumber'."
  msgstr "发现记录类型 '%s' 有重复。"
  
-#: setup/class_setupStep_Migrate.inc:357 setup/class_setupStep_Migrate.inc:568
-#: setup/class_setupStep_Migrate.inc:581 setup/class_setupStep_Migrate.inc:942
-#: setup/class_setupStep_Migrate.inc:1821
-#: setup/class_setupStep_Migrate.inc:1834
+#: setup/class_setupStep_Migrate.inc:363 setup/class_setupStep_Migrate.inc:574
+#: setup/class_setupStep_Migrate.inc:587
+#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1038
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:1958
+#: setup/class_setupStep_Migrate.inc:3023
  msgid "Failed"
  msgstr "失败"
  
-#: setup/class_setupStep_Migrate.inc:359
+#: setup/class_setupStep_Migrate.inc:365
  #, php-format
  msgid ""
  "Found %s winstations outside the predefined winstation department ou '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:360 setup/class_setupStep_Migrate.inc:649
-#: setup/class_setupStep_Migrate.inc:789
-#: setup/class_setupStep_Migrate.inc:2262
-#: setup/class_setupStep_Migrate.inc:2416
-#: setup/class_setupStep_Migrate.inc:2746
+#: setup/class_setupStep_Migrate.inc:366 setup/class_setupStep_Migrate.inc:655
+#: setup/class_setupStep_Migrate.inc:795
+#: setup/class_setupStep_Migrate.inc:1023
+#: setup/class_setupStep_Migrate.inc:2386
+#: setup/class_setupStep_Migrate.inc:2540
+#: setup/class_setupStep_Migrate.inc:2870
  #, fuzzy
  msgid "Migrate"
  msgstr "创建"
  
-#: setup/class_setupStep_Migrate.inc:432
+#: setup/class_setupStep_Migrate.inc:438
  #, php-format
  msgid "Found %s groups outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:433 setup/class_setupStep_Migrate.inc:510
+#: setup/class_setupStep_Migrate.inc:439 setup/class_setupStep_Migrate.inc:516
  #, fuzzy
  msgid "Move"
  msgstr "模式"
  
-#: setup/class_setupStep_Migrate.inc:509
+#: setup/class_setupStep_Migrate.inc:515
  #, php-format
  msgid "Found %s user(s) outside the configured tree '%s'."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:570 setup/class_setupStep_Migrate.inc:583
+#: setup/class_setupStep_Migrate.inc:576 setup/class_setupStep_Migrate.inc:589
  #, php-format
  msgid ""
  "The specified user '%s' does not have full access to your ldap database."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:647
+#: setup/class_setupStep_Migrate.inc:653
  #, php-format
  msgid "Found %s user(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:1105
  #, fuzzy
  msgid "Migration error"
  msgstr "创建"
  
-#: setup/class_setupStep_Migrate.inc:697 setup/class_setupStep_Migrate.inc:840
+#: setup/class_setupStep_Migrate.inc:703 setup/class_setupStep_Migrate.inc:846
  #, fuzzy, php-format
  msgid "Cannot migrate department '%s':"
  msgstr "转到根部门"
  
-#: setup/class_setupStep_Migrate.inc:788
+#: setup/class_setupStep_Migrate.inc:794
  #, php-format
  msgid "Found %s department(s) that will not be visible in GOsa."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:943
+#: setup/class_setupStep_Migrate.inc:1017
+#, php-format
+msgid "GOsa 2.5 adminitrative accounts found: %s."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1022
+#, fuzzy
+msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
+msgstr "创建 netatalk 账号"
+
+#: setup/class_setupStep_Migrate.inc:1039
  msgid "There is no GOsa administrator account inside your LDAP."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1009
+#: setup/class_setupStep_Migrate.inc:1105
  #, php-format
  msgid "Cannot add ACL for user '%s':"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1047
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1143
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Input error"
  msgstr "PHP 错误"
  
-#: setup/class_setupStep_Migrate.inc:1047
+#: setup/class_setupStep_Migrate.inc:1143
  msgid "Uid"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Password error"
  msgstr "口令过期截止日"
  
-#: setup/class_setupStep_Migrate.inc:1052
+#: setup/class_setupStep_Migrate.inc:1148
  #, fuzzy
  msgid "Provided passwords do not match!"
  msgstr "输入的新口令和重复口令不匹配！"
  
-#: setup/class_setupStep_Migrate.inc:1057
+#: setup/class_setupStep_Migrate.inc:1153
  #, fuzzy
  msgid "Specify a valid user ID!"
  msgstr "请输入一个有效的用户名！"
  
-#: setup/class_setupStep_Migrate.inc:1090
+#: setup/class_setupStep_Migrate.inc:1186
  #, fuzzy, php-format
  msgid "Adding an administrative user failed: object '%s' already exists!"
  msgstr "为对象 '%s' 设置动作状态(FAIstate) 失败，值为 '%s'。"
  
-#: setup/class_setupStep_Migrate.inc:1129
-#: setup/class_setupStep_Migrate.inc:1178
-#: setup/class_setupStep_Migrate.inc:1227
+#: setup/class_setupStep_Migrate.inc:1225
+#: setup/class_setupStep_Migrate.inc:1274
+#: setup/class_setupStep_Migrate.inc:1323
  #, fuzzy
  msgid "Cannot move users to the requested department!"
  msgstr "选择放置部门的子树"
  
-#: setup/class_setupStep_Migrate.inc:1139
+#: setup/class_setupStep_Migrate.inc:1235
  msgid "Winstation will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1150
-#: setup/class_setupStep_Migrate.inc:1199
+#: setup/class_setupStep_Migrate.inc:1246
+#: setup/class_setupStep_Migrate.inc:1295
  msgid "Updating following references too"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1189
+#: setup/class_setupStep_Migrate.inc:1285
  msgid "Group will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1237
+#: setup/class_setupStep_Migrate.inc:1333
  msgid "User will be moved from"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1247
+#: setup/class_setupStep_Migrate.inc:1343
  msgid "The following references will be updated"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1946
  msgid ""
  "The LDAP root object is missing. It is required to use your LDAP service."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1823
-#: setup/class_setupStep_Migrate.inc:1836
+#: setup/class_setupStep_Migrate.inc:1947
+#: setup/class_setupStep_Migrate.inc:1960
  msgid "Try to create root object"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:1835
+#: setup/class_setupStep_Migrate.inc:1959
  msgid "Root object couldn't be created, you should try it on your own."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2126
+#: setup/class_setupStep_Migrate.inc:2250
  #, fuzzy, php-format
  msgid "Copy '%s' to '%s' failed:"
  msgstr "移动 '%s' 到 '%s'"
  
-#: setup/class_setupStep_Migrate.inc:2261
+#: setup/class_setupStep_Migrate.inc:2385
  #, php-format
  msgid "There are %s devices that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2321
+#: setup/class_setupStep_Migrate.inc:2445
  #, php-format
  msgid "Adding '%s' to the LDAP failed: %s"
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2341
-#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2465
+#: setup/class_setupStep_Migrate.inc:2582
  #, fuzzy, php-format
  msgid "Updating '%s' failed: %s"
  msgstr "Logging DB 用户"
  
-#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2538
  #, php-format
  msgid "There are %s services that need to be migrated."
  msgstr ""
  
-#: setup/class_setupStep_Migrate.inc:2745
+#: setup/class_setupStep_Migrate.inc:2869
  #, php-format
  msgid "There are %s application menus which have to be migrated."
  msgstr ""
@@ -5887,16 +5901,16 @@ msgid "Move selected groups into this group tree"
  msgstr ""
  
  #: setup/setup_migrate.tpl:125 setup/setup_migrate.tpl:177
-#: setup/setup_migrate.tpl:298 setup/setup_migrate.tpl:351
-#: setup/setup_migrate.tpl:395 setup/setup_migrate.tpl:438
-#: setup/setup_migrate.tpl:482
+#: setup/setup_migrate.tpl:226 setup/setup_migrate.tpl:344
+#: setup/setup_migrate.tpl:397 setup/setup_migrate.tpl:441
+#: setup/setup_migrate.tpl:484 setup/setup_migrate.tpl:528
  msgid "Hide changes"
  msgstr ""
  
  #: setup/setup_migrate.tpl:127 setup/setup_migrate.tpl:179
-#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:353
-#: setup/setup_migrate.tpl:398 setup/setup_migrate.tpl:441
-#: setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:209 setup/setup_migrate.tpl:346
+#: setup/setup_migrate.tpl:399 setup/setup_migrate.tpl:444
+#: setup/setup_migrate.tpl:487 setup/setup_migrate.tpl:531
  #, fuzzy
  msgid "Show changes"
  msgstr "显示软件包"
@@ -5923,84 +5937,100 @@ msgstr ""
  msgid "Move selected users into this people tree"
  msgstr "创建使用该模板的用户"
  
-#: setup/setup_migrate.tpl:199
+#: setup/setup_migrate.tpl:191
+#, fuzzy
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr "创建 netatalk 账号"
+
+#: setup/setup_migrate.tpl:193
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
+"useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl:216 setup/setup_migrate.tpl:316
+#: setup/setup_migrate.tpl:370 setup/setup_migrate.tpl:425
+#: setup/setup_migrate.tpl:468 setup/setup_migrate.tpl:512
+#, fuzzy
+msgid "Current"
+msgstr "当前版本"
+
+#: setup/setup_migrate.tpl:220 setup/setup_migrate.tpl:323
+#: setup/setup_migrate.tpl:377 setup/setup_migrate.tpl:429
+#: setup/setup_migrate.tpl:472 setup/setup_migrate.tpl:516
+#, fuzzy
+msgid "After migration"
+msgstr "用户管理"
+
+#: setup/setup_migrate.tpl:229 setup/setup_ldap.tpl:65
+#, fuzzy
+msgid "Reload"
+msgstr "读"
+
+#: setup/setup_migrate.tpl:245
  #, fuzzy
  msgid "Abort"
  msgstr "端口"
  
-#: setup/setup_migrate.tpl:201
+#: setup/setup_migrate.tpl:247
  #, fuzzy
  msgid "Create a new GOsa administrator account"
  msgstr "创建 netatalk 账号"
  
-#: setup/setup_migrate.tpl:204
+#: setup/setup_migrate.tpl:250
  msgid ""
  "This dialog will automatically add a new super administrator to your LDAP "
  "tree."
  msgstr ""
  
-#: setup/setup_migrate.tpl:233
+#: setup/setup_migrate.tpl:279
  #, fuzzy
  msgid "Password (again)"
  msgstr "口令存储"
  
-#: setup/setup_migrate.tpl:259
+#: setup/setup_migrate.tpl:305
  msgid ""
  "The listed departments are currently invisible in the GOsa user interface. "
  "If you want to change this for a couple of entries, select them and use the "
  "migrate button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:260 setup/setup_migrate.tpl:315
-#: setup/setup_migrate.tpl:371 setup/setup_migrate.tpl:415
-#: setup/setup_migrate.tpl:459
+#: setup/setup_migrate.tpl:306 setup/setup_migrate.tpl:361
+#: setup/setup_migrate.tpl:417 setup/setup_migrate.tpl:461
+#: setup/setup_migrate.tpl:505
  msgid ""
  "If you want to know what will be done when migrating the selected entries, "
  "use the 'Show changes' button to see the LDIF."
  msgstr ""
  
-#: setup/setup_migrate.tpl:270 setup/setup_migrate.tpl:324
-#: setup/setup_migrate.tpl:379 setup/setup_migrate.tpl:422
-#: setup/setup_migrate.tpl:466
-#, fuzzy
-msgid "Current"
-msgstr "当前版本"
-
-#: setup/setup_migrate.tpl:277 setup/setup_migrate.tpl:331
-#: setup/setup_migrate.tpl:383 setup/setup_migrate.tpl:426
-#: setup/setup_migrate.tpl:470
-#, fuzzy
-msgid "After migration"
-msgstr "用户管理"
-
-#: setup/setup_migrate.tpl:314
+#: setup/setup_migrate.tpl:360
  msgid ""
  "The listed users are currently invisible in the GOsa user interface. If you "
  "want to change this for a couple of users, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:370
+#: setup/setup_migrate.tpl:416
  msgid ""
  "The listed devices are currently invisible in the GOsa interface. If you "
  "want to change this for a couple of devices, just select them and use the "
  "'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:396 setup/setup_migrate.tpl:439
-#: setup/setup_migrate.tpl:483
+#: setup/setup_migrate.tpl:442 setup/setup_migrate.tpl:485
+#: setup/setup_migrate.tpl:529
  #, fuzzy
  msgid "Refresh"
  msgstr "参考"
  
-#: setup/setup_migrate.tpl:414
+#: setup/setup_migrate.tpl:460
  msgid ""
  "The listed services are currently invalid for the GOsa version you are going "
  "to install. If you want to update a couple of service, just select them and "
  "use the 'Migrate' button below."
  msgstr ""
  
-#: setup/setup_migrate.tpl:458
+#: setup/setup_migrate.tpl:504
  msgid ""
  "The listed menus are currently invisible in the GOsa interface. If you want "
  "to change this for a couple of devices, just select them and use the "
@@ -6178,11 +6208,6 @@ msgstr "连接 URL"
  msgid "TLS connection"
  msgstr "连接"
  
-#: setup/setup_ldap.tpl:65
-#, fuzzy
-msgid "Reload"
-msgstr "读"
-
  #: setup/setup_ldap.tpl:69
  #, fuzzy
  msgid "Authentication"
@@ -6542,7 +6567,7 @@ msgstr ""
  "如果锁检查失败，明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍"
  "然编辑”按钮来接管这个锁文件。"
  
-#: ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/islocked.tpl:16
  #, fuzzy
  msgid "Read only"
  msgstr "重新加载列表"
@@ -6558,6 +6583,17 @@ msgid ""
  "avoid an automatic re-authentication by your browser."
  msgstr ""
  
+#, fuzzy
+#~ msgid "Create new"
+#~ msgstr "创建"
+
+#, fuzzy
+#~ msgid ""
+#~ "This account has %s features settings. To disable them, you'll need to "
+#~ "add the %s settings first!"
+#~ msgstr ""
+#~ "这个账户已经启用 unix 功能。要禁用，您需要先删除 samba / 环境变量账户。"
+
  #, fuzzy
  #~ msgid ""
  #~ "GOsa requires this module to show printers that are not defined within "
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc

index eabeaf358ece3015dfe1b524175d49c81d88f2a6..9aeff56552c9c0c10c6fe64e51e05f8474a5b59d 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -906,7 +906,7 @@ class ogroup extends plugin
          foreach($test as $dn){
            $str .= "<li>".$dn."</li>";
          }
-        $message[] = sprintf(_("These systems are already configured by other object groups and cannot be added:<br><ul>%s</ul>"),$str);
+        $message[] = sprintf(_("These systems are already configured by other object groups and cannot be added:")."<br><ul>%s</ul>",$str);
        }
      }
  
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc

index 1a23f45acba4bb6c8ae04b5f9a2ee18c33896113..5822d004dadd670179c033fd766d1402115ef316 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -1021,7 +1021,7 @@ class Step_Migrate extends setup_step
          $this->checks['acls']['ERROR_MSG'] = $str;
          $this->checks['acls']['ERROR_MSG'].= _("There is no valid GOsa 2.6 administrator account inside your LDAP.")."&nbsp;";
          $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='migrate_acls' value='"._("Migrate")."'>";
-        $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create new")."'>";
+        $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
        }elseif($GOsa_26_found){
          $str = "";
          if(!empty($valid_users)){
author	cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)
committer	cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Tue, 9 Dec 2008 14:33:26 +0000 (14:33 +0000)
gosa-core/locale/core/de/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/es/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/fr/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/it/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/messages.po		patch \| blob \| history
gosa-core/locale/core/nl/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/pl/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/ru/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/vi/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/zh/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/plugins/admin/ogroups/class_ogroup.inc		patch \| blob \| history
gosa-core/setup/class_setupStep_Migrate.inc		patch \| blob \| history