Code

Updated messages
[gosa.git] / locale / messages.po
index 146c3d7451b0267d89dc33409f7f04acca025795..23a5b04915866e5faf5dda39429dbf472368b88c 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-08 09:22+0200\n"
+"POT-Creation-Date: 2007-05-10 13:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,19 +20,19 @@ msgstr ""
 msgid "My account"
 msgstr ""
 
-#: contrib/gosa.conf:30
+#: contrib/gosa.conf:34
 msgid "Administration"
 msgstr ""
 
-#: contrib/gosa.conf:59
+#: contrib/gosa.conf:62
 msgid "Addons"
 msgstr ""
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
-#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:151
-#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
-#: contrib/gosa.conf:171 contrib/gosa.conf:176
+#: contrib/gosa.conf:85 contrib/gosa.conf:100 contrib/gosa.conf:104
+#: contrib/gosa.conf:113 contrib/gosa.conf:119 contrib/gosa.conf:124
+#: contrib/gosa.conf:130 contrib/gosa.conf:139 contrib/gosa.conf:153
+#: contrib/gosa.conf:163 contrib/gosa.conf:168 contrib/gosa.conf:190
+#: contrib/gosa.conf:195 contrib/gosa.conf:200 contrib/gosa.conf:204
 #: plugins/personal/posix/generic.tpl:4 plugins/personal/mail/generic.tpl:4
 #: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -55,22 +55,22 @@ msgstr ""
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/groups/mail.tpl:7 plugins/admin/ogroups/termgroup.tpl:6
-#: setup/setup_feedback.tpl:44
+#: setup/setup_feedback.tpl:46
 msgid "Generic"
 msgstr ""
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:86
 msgid "Unix"
 msgstr ""
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:91
+#: contrib/gosa.conf:87 contrib/gosa.conf:105
 #: plugins/personal/environment/class_environment.inc:7
 #: plugins/admin/groups/class_divListGroup.inc:131
 #: plugins/admin/users/class_divListUsers.inc:141
 msgid "Environment"
 msgstr ""
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:93
+#: contrib/gosa.conf:88 contrib/gosa.conf:107
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/generic/references/class_reference.inc:24
 #: plugins/admin/groups/class_divListGroup.inc:123
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Mail"
 msgstr ""
 
-#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:89 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 #: plugins/admin/groups/class_divListGroup.inc:125
@@ -90,18 +90,18 @@ msgstr ""
 msgid "Samba"
 msgstr ""
 
-#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: contrib/gosa.conf:90 plugins/personal/netatalk/class_netatalk.inc:36
 #: plugins/admin/users/class_divListUsers.inc:151
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:82
+#: contrib/gosa.conf:91
 #: plugins/personal/connectivity/class_connectivity.inc:15
 #: plugins/personal/connectivity/main.inc:143
 msgid "Connectivity"
 msgstr ""
 
-#: contrib/gosa.conf:83 html/getxls.php:174 html/getxls.php:236
+#: contrib/gosa.conf:92 html/getxls.php:174 html/getxls.php:236
 #: plugins/personal/generic/generic.tpl:271
 #: plugins/personal/generic/generic.tpl:402
 #: plugins/gofax/faxaccount/generic.tpl:10
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Fax"
 msgstr ""
 
-#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
+#: contrib/gosa.conf:93 plugins/personal/generic/generic.tpl:254
 #: plugins/personal/generic/generic.tpl:392
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/addons/addressbook/contents.tpl:14
@@ -131,28 +131,27 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
-#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:95 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
-#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
-#: contrib/gosa.conf:137 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:157 contrib/gosa.conf:162 contrib/gosa.conf:167
-#: contrib/gosa.conf:172 contrib/gosa.conf:177
-msgid "References"
-msgstr ""
-
-#: contrib/gosa.conf:92
+#: contrib/gosa.conf:106
 #: plugins/admin/applications/class_applicationManagement.inc:25
 msgid "Applications"
 msgstr ""
 
-#: contrib/gosa.conf:94
+#: contrib/gosa.conf:108
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:100 plugins/gofon/conference/generic.tpl:100
+#: contrib/gosa.conf:109 contrib/gosa.conf:115 contrib/gosa.conf:120
+#: contrib/gosa.conf:126 contrib/gosa.conf:135 contrib/gosa.conf:149
+#: contrib/gosa.conf:159 contrib/gosa.conf:164 contrib/gosa.conf:169
+#: contrib/gosa.conf:191 contrib/gosa.conf:196
+msgid "References"
+msgstr ""
+
+#: contrib/gosa.conf:114 plugins/gofon/conference/generic.tpl:100
 #: plugins/admin/systems/class_servRepository.inc:282
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/applications/generic.tpl:73
@@ -160,21 +159,21 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:870
+#: contrib/gosa.conf:125 plugins/gofon/phoneaccount/class_phoneAccount.inc:870
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
+#: contrib/gosa.conf:131 contrib/gosa.conf:140 contrib/gosa.conf:154
 #: plugins/admin/ogroups/tabs_ogroups.inc:100
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:143
+#: contrib/gosa.conf:132 contrib/gosa.conf:155
 #: plugins/admin/ogroups/tabs_ogroups.inc:104
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: contrib/gosa.conf:133 contrib/gosa.conf:156
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/generic/references/class_reference.inc:52
 #: plugins/admin/systems/class_systemManagement.inc:878
@@ -182,7 +181,7 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
+#: contrib/gosa.conf:134 contrib/gosa.conf:148 contrib/gosa.conf:157
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
 #: ihtml/themes/default/MultiSelectWindow.tpl:27
 #: ihtml/themes/default/MultiSelectWindow.tpl:66
@@ -201,29 +200,33 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:127
+#: contrib/gosa.conf:141
 msgid "Databases"
 msgstr ""
 
-#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:33
+#: contrib/gosa.conf:142 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr ""
 
-#: contrib/gosa.conf:132 contrib/gosa.conf:134
-#: plugins/admin/systems/servRepositorySetup.tpl:1
+#: contrib/gosa.conf:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr ""
+
+#: contrib/gosa.conf:146 plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:135 contrib/gosa.conf:146
+#: contrib/gosa.conf:147 contrib/gosa.conf:158
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:217
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:229 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -233,11 +236,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:230
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:201 plugins/personal/environment/logonManagement.tpl:65
+#: contrib/gosa.conf:231 plugins/personal/environment/logonManagement.tpl:65
 #: plugins/personal/mail/generic.tpl:192
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -248,80 +251,76 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:232
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:206
+#: contrib/gosa.conf:236
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:240 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
 #: plugins/admin/fai/faiHookEntry.tpl:50
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiSummaryTab.inc:40
+#: contrib/gosa.conf:244 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:41
+#: contrib/gosa.conf:248 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:252 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:226 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:256 plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:227 plugins/admin/ogroups/tabs_ogroups.inc:109
+#: contrib/gosa.conf:257 plugins/admin/ogroups/tabs_ogroups.inc:109
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:231
+#: contrib/gosa.conf:261
 msgid "Packages"
 msgstr ""
 
-#: contrib/gosa.conf:253
-msgid "{LOCATIONNAME}"
-msgstr ""
-
-#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:262
+#: contrib/gosa.conf:437 plugins/admin/ogroups/class_phonequeue.inc:262
 #: setup/class_setupStep_Language.inc:48
 msgid "German"
 msgstr ""
 
-#: contrib/gosa.conf:273 setup/class_setupStep_Language.inc:51
+#: contrib/gosa.conf:438 setup/class_setupStep_Language.inc:51
 msgid "Russian"
 msgstr ""
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:439
 msgid "Spanish"
 msgstr ""
 
-#: contrib/gosa.conf:275 setup/class_setupStep_Language.inc:49
+#: contrib/gosa.conf:440 setup/class_setupStep_Language.inc:49
 msgid "French"
 msgstr ""
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:441
 msgid "Dutch"
 msgstr ""
 
-#: contrib/gosa.conf:277 setup/class_setupStep_Language.inc:50
+#: contrib/gosa.conf:442 setup/class_setupStep_Language.inc:50
 msgid "English"
 msgstr ""
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:443
 msgid "Italian"
 msgstr ""
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:444
 msgid "Polish"
 msgstr ""
 
@@ -422,7 +421,7 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/admin/systems/class_systemManagement.inc:243
 #: plugins/admin/fai/faiNewBranch.tpl:52
-#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1529
+#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1530
 #: setup/class_setup.inc:275 setup/class_setup.inc:277
 msgid "Back"
 msgstr ""
@@ -514,7 +513,7 @@ msgstr ""
 
 #: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/altlinux/conflict.tpl:6
 #: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: html/index.php:49 html/index.php:342 html/index.php:348
+#: html/index.php:49 html/index.php:349 html/index.php:355
 #: plugins/gofax/blocklists/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
 #: plugins/gofon/conference/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2
@@ -525,10 +524,10 @@ msgstr ""
 #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/users/remove.tpl:2
 #: include/sieve/templates/remove_script.tpl:2 setup/setup_checks.tpl:32
-#: setup/setup_checks.tpl:93 setup/class_setupStep_Migrate.inc:212
-#: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:365
-#: setup/class_setupStep_Migrate.inc:411 setup/class_setupStep_Migrate.inc:546
-#: setup/class_setupStep_Migrate.inc:676
+#: setup/setup_checks.tpl:93 setup/class_setupStep_Migrate.inc:211
+#: setup/class_setupStep_Migrate.inc:260 setup/class_setupStep_Migrate.inc:364
+#: setup/class_setupStep_Migrate.inc:410 setup/class_setupStep_Migrate.inc:545
+#: setup/class_setupStep_Migrate.inc:675
 msgid "Warning"
 msgstr ""
 
@@ -652,9 +651,9 @@ msgstr ""
 #: include/sieve/templates/select_test_type.tpl:13
 #: include/sieve/templates/create_script.tpl:15
 #: include/sieve/templates/remove_script.tpl:16
-#: include/sieve/templates/element_comment.tpl:10 setup/setup_migrate.tpl:131
-#: setup/setup_migrate.tpl:179 setup/setup_migrate.tpl:267
-#: setup/setup_migrate.tpl:322 setup/setup_migrate.tpl:376
+#: include/sieve/templates/element_comment.tpl:10 setup/setup_migrate.tpl:134
+#: setup/setup_migrate.tpl:185 setup/setup_migrate.tpl:249
+#: setup/setup_migrate.tpl:310 setup/setup_migrate.tpl:366
 #: setup/setup_ldap.tpl:17
 msgid "Cancel"
 msgstr ""
@@ -692,7 +691,7 @@ msgid "You already have an Administrative Account and a Group."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6 html/index.php:250
+#: ihtml/themes/default/setup_useradmin.tpl:6 html/index.php:257
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -725,7 +724,7 @@ msgstr ""
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
 #: plugins/admin/systems/class_divListSystem.inc:178
-#: setup/setup_migrate.tpl:218 setup/setup_config2.tpl:181
+#: setup/setup_migrate.tpl:224 setup/setup_config2.tpl:181
 #: setup/setup_config2.tpl:226
 msgid "Password"
 msgstr ""
@@ -1084,13 +1083,6 @@ msgstr ""
 msgid "Click here to Change your password"
 msgstr ""
 
-#: html/setup.php:89
-#, php-format
-msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
-msgstr ""
-
 #: html/main.php:164
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
@@ -1170,7 +1162,7 @@ msgstr ""
 #: html/getxls.php:80 html/getxls.php:108 html/getxls.php:123
 #: html/getxls.php:282 html/getxls.php:299
 #: plugins/addons/addressbook/class_addressbook.inc:524
-#: setup/setup_migrate.tpl:210
+#: setup/setup_migrate.tpl:216
 msgid "User ID"
 msgstr ""
 
@@ -1274,8 +1266,8 @@ msgstr ""
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/class_faiSummaryTab.inc:329
 #: plugins/admin/fai/paste_fai_object.tpl:1
-#: plugins/admin/fai/faiVariableEntry.tpl:9 setup/setup_migrate.tpl:202
-#: setup/setup_feedback.tpl:20
+#: plugins/admin/fai/faiVariableEntry.tpl:9 setup/setup_migrate.tpl:208
+#: setup/setup_feedback.tpl:22
 msgid "Name"
 msgstr ""
 
@@ -1302,7 +1294,7 @@ msgid "Location"
 msgstr ""
 
 #: html/getxls.php:174 plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 setup/setup_feedback.tpl:28
+#: plugins/admin/systems/servdnseditzone.tpl:51 setup/setup_feedback.tpl:30
 msgid "Mail address"
 msgstr ""
 
@@ -1399,7 +1391,7 @@ msgid "Mobile"
 msgstr ""
 
 #: html/getxls.php:236 plugins/personal/generic/generic.tpl:213
-#: setup/setup_feedback.tpl:12
+#: setup/setup_feedback.tpl:14
 msgid "Organization"
 msgstr ""
 
@@ -1466,17 +1458,17 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/index.php:49 html/index.php:342
+#: html/index.php:49 html/index.php:349
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/index.php:49 html/index.php:342
+#: html/index.php:49 html/index.php:349
 msgid "Enter SSL session"
 msgstr ""
 
 #: html/index.php:117
 #, php-format
-msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
+msgid "GOsa configuration %s/%s is not readable. Aborted."
 msgstr ""
 
 #: html/index.php:138
@@ -1484,38 +1476,38 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:207 include/class_config.inc:207
+#: html/index.php:207 include/class_config.inc:208
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: html/index.php:223
+#: html/index.php:222
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:231
+#: html/index.php:238
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:258
+#: html/index.php:265
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:260
+#: html/index.php:267
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:267
+#: html/index.php:274
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:296
+#: html/index.php:303
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 
-#: html/index.php:348
+#: html/index.php:355
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2389,10 +2381,10 @@ msgstr ""
 #: plugins/admin/fai/faiVariableEntry.tpl:48
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: include/sieve/templates/create_script.tpl:13 setup/setup_migrate.tpl:129
-#: setup/setup_migrate.tpl:177 setup/setup_migrate.tpl:262
-#: setup/setup_migrate.tpl:264 setup/setup_migrate.tpl:320
-#: setup/setup_migrate.tpl:374 setup/setup_ldap.tpl:16
+#: include/sieve/templates/create_script.tpl:13 setup/setup_migrate.tpl:132
+#: setup/setup_migrate.tpl:183 setup/setup_migrate.tpl:248
+#: setup/setup_migrate.tpl:308 setup/setup_migrate.tpl:364
+#: setup/setup_ldap.tpl:16
 msgid "Apply"
 msgstr ""
 
@@ -2461,7 +2453,7 @@ msgstr ""
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/fai/class_faiSummaryTab.inc:227
-#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:78
+#: include/class_MultiSelectWindow.inc:79 setup/setup_migrate.tpl:79
 msgid "Close"
 msgstr ""
 
@@ -3475,10 +3467,6 @@ msgstr ""
 msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
-
 #: plugins/personal/connectivity/class_kolabAccount.inc:125
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
@@ -4459,7 +4447,6 @@ msgstr ""
 #: plugins/admin/systems/class_printGeneric.inc:849
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 #: plugins/admin/ogroups/class_ogroupManagement.inc:363
-#: setup/setup_migrate.tpl:241 setup/setup_migrate.tpl:244
 #: setup/setup_config2.tpl:172 setup/setup_config2.tpl:217
 msgid "User"
 msgstr ""
@@ -5155,12 +5142,12 @@ msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: setup/setup_checks.tpl:27 setup/setup_checks.tpl:87
-#: setup/class_setupStep_Migrate.inc:218 setup/class_setupStep_Migrate.inc:267
-#: setup/class_setupStep_Migrate.inc:325 setup/class_setupStep_Migrate.inc:372
-#: setup/class_setupStep_Migrate.inc:418 setup/class_setupStep_Migrate.inc:489
-#: setup/class_setupStep_Migrate.inc:542 setup/class_setupStep_Migrate.inc:672
-#: setup/class_setupStep_Migrate.inc:761
-#: setup/class_setupStep_Migrate.inc:1440
+#: setup/class_setupStep_Migrate.inc:217 setup/class_setupStep_Migrate.inc:266
+#: setup/class_setupStep_Migrate.inc:324 setup/class_setupStep_Migrate.inc:371
+#: setup/class_setupStep_Migrate.inc:417 setup/class_setupStep_Migrate.inc:488
+#: setup/class_setupStep_Migrate.inc:541 setup/class_setupStep_Migrate.inc:671
+#: setup/class_setupStep_Migrate.inc:803
+#: setup/class_setupStep_Migrate.inc:1554
 msgid "Ok"
 msgstr ""
 
@@ -5990,7 +5977,7 @@ msgid ""
 msgstr ""
 
 #: plugins/addons/addressbook/class_addressbook.inc:6
-#: setup/class_setupStep_Feedback.inc:106
+#: setup/class_setupStep_Feedback.inc:105
 msgid "Addressbook"
 msgstr ""
 
@@ -6686,7 +6673,6 @@ msgstr ""
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
-#: setup/setup_migrate.tpl:240 setup/setup_migrate.tpl:243
 msgid "Group"
 msgstr ""
 
@@ -9328,7 +9314,7 @@ msgstr ""
 msgid "Other network component"
 msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:767
+#: plugins/admin/systems/chooser.tpl:16 setup/class_setupStep_Migrate.inc:809
 msgid "Create"
 msgstr ""
 
@@ -10076,8 +10062,8 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Ldap.inc:74 setup/setup_feedback.tpl:51
-#: setup/setup_feedback.tpl:69 setup/class_setupStep_Schema.inc:63
+#: setup/class_setupStep_Ldap.inc:74 setup/setup_feedback.tpl:53
+#: setup/setup_feedback.tpl:71 setup/class_setupStep_Schema.inc:63
 #: setup/class_setupStep_Config3.inc:76
 msgid "Yes"
 msgstr ""
@@ -10093,8 +10079,8 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Ldap.inc:74 setup/setup_feedback.tpl:53
-#: setup/setup_feedback.tpl:71 setup/class_setupStep_Schema.inc:63
+#: setup/class_setupStep_Ldap.inc:74 setup/setup_feedback.tpl:55
+#: setup/setup_feedback.tpl:73 setup/class_setupStep_Schema.inc:63
 #: setup/class_setupStep_Config3.inc:76
 msgid "No"
 msgstr ""
@@ -11341,7 +11327,7 @@ msgstr ""
 msgid "Choosen packages"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:668
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
 msgid "Configure"
 msgstr ""
 
@@ -12964,141 +12950,203 @@ msgid ""
 "Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
 msgstr ""
 
-#: include/functions.inc:299
+#: include/functions.inc:300
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:316
+#: include/functions.inc:317
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr ""
 
-#: include/functions.inc:337
+#: include/functions.inc:338
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 
-#: include/functions.inc:469
+#: include/functions.inc:470
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
 msgstr ""
 
-#: include/functions.inc:479
+#: include/functions.inc:480
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf! LDAP server says '%s'."
+"entry in %s! LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:494
+#: include/functions.inc:495
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:520
+#: include/functions.inc:521
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions.inc:550
+#: include/functions.inc:551
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
 msgstr ""
 
-#: include/functions.inc:560
+#: include/functions.inc:561
+#, php-format
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf!"
+"entry in %s!"
 msgstr ""
 
-#: include/functions.inc:568
+#: include/functions.inc:569
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:654
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:656
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:673
+#: include/functions.inc:674
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1116 include/functions.inc:1310
+#: include/functions.inc:1117 include/functions.inc:1311
 msgid "LDAP error:"
 msgstr ""
 
-#: include/functions.inc:1117
+#: include/functions.inc:1118
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1125
+#: include/functions.inc:1126
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1134
+#: include/functions.inc:1135
 msgid "An error occured while processing your request"
 msgstr ""
 
-#: include/functions.inc:1138 include/functions_setup.inc:254
+#: include/functions.inc:1139
 msgid "OK"
 msgstr ""
 
-#: include/functions.inc:1199
+#: include/functions.inc:1200
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1201
+#: include/functions.inc:1202
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1203
+#: include/functions.inc:1204
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
 "Please contact the person in order to clarify proceedings."
 msgstr ""
 
-#: include/functions.inc:1492
+#: include/functions.inc:1493
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1520
+#: include/functions.inc:1521
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1794
+#: include/functions.inc:1795
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1837
+#: include/functions.inc:1838
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2179 include/functions.inc:2183
+#: include/functions.inc:2240 include/functions.inc:2244
 msgid "Warning - base_hook is not avialable. Using default base."
 msgstr ""
 
-#: include/functions.inc:2189
+#: include/functions.inc:2250
 msgid "Warning - no base_hook defined. Using default base."
 msgstr ""
 
+#: include/functions.inc:2275 setup/class_setupStep_Schema.inc:95
+msgid "Can't get schema information from server. No schema check possible!"
+msgstr ""
+
+#: include/functions.inc:2301
+msgid "Used to store account specific informations."
+msgstr ""
+
+#: include/functions.inc:2308
+msgid ""
+"Used to lock currently edited entries to avoid multiple changes at the same "
+"time."
+msgstr ""
+
+#: include/functions.inc:2351
+#, php-format
+msgid "The required objectClass '%s' is not present in your schema setup"
+msgstr ""
+
+#: include/functions.inc:2353
+#, php-format
+msgid "The optional objectClass '%s' is not present in your schema setup"
+msgstr ""
+
+#: include/functions.inc:2359
+#, php-format
+msgid "The required objectclass '%s' does not have version %s"
+msgstr ""
+
+#: include/functions.inc:2361
+#, php-format
+msgid "The optional objectclass '%s' does not have version %s"
+msgstr ""
+
+#: include/functions.inc:2365
+#, php-format
+msgid "Class(es) available"
+msgstr ""
+
+#: include/functions.inc:2388
+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:2389
+msgid ""
+"In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
+"be      AUXILIARY"
+msgstr ""
+
+#: include/functions.inc:2393
+msgid ""
+"You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
+"schema   configuration do not support this option."
+msgstr ""
+
+#: include/functions.inc:2394
+msgid "The objectClass 'posixGroup' must be STRUCTURAL"
+msgstr ""
+
 #: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
@@ -13188,53 +13236,64 @@ msgstr ""
 msgid "Unknown FAIstate %s"
 msgstr ""
 
-#: include/class_ldap.inc:673
+#: include/class_ldap.inc:739
 #, php-format
 msgid ""
-"The referral url '%s' is missing the ldap base. It should look like this "
-"'ldap://server:port/base'."
+"Autocreation of subtree failed. No objectClass found for attribute '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:734
+#: include/class_ldap.inc:787 include/class_ldap.inc:877
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
 "GOsa team."
 msgstr ""
 
-#: include/class_ldap.inc:803
+#: include/class_ldap.inc:795
+#, php-format
+msgid "Creating subtree '%s' failed."
+msgstr ""
+
+#: include/class_ldap.inc:816
+#, php-format
+msgid ""
+"The referral url '%s' is missing the ldap base. It should look like this "
+"'ldap://server:port/base'."
+msgstr ""
+
+#: include/class_ldap.inc:946
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:805
+#: include/class_ldap.inc:948
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1001
+#: include/class_ldap.inc:1144
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1014
+#: include/class_ldap.inc:1157
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr ""
 
-#: include/class_ldap.inc:1030
+#: include/class_ldap.inc:1173
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_config.inc:71
 #, php-format
-msgid "XML error in gosa.conf: %s at line %d"
+msgid "XML error in %s: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:509
+#: include/class_config.inc:510
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr ""
 
@@ -13273,13 +13332,14 @@ msgid ""
 msgstr ""
 
 #: include/class_password-methods.inc:204
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#, php-format
+msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 
 #: include/class_pluglist.inc:116
+#, php-format
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
+"Your %s information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
 msgstr ""
 
@@ -13391,446 +13451,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/functions_setup.inc:84 setup/class_setupStep_Schema.inc:101
-msgid "Can't get schema information from server. No schema check possible!"
-msgstr ""
-
-#: include/functions_setup.inc:99
-#, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
-"setup"
-msgstr ""
-
-#: include/functions_setup.inc:103
-#, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' does not have version %s"
-msgstr ""
-
-#: include/functions_setup.inc:108
-#, php-format
-msgid "Support for '%s' enabled"
-msgstr ""
-
-#: include/functions_setup.inc:118
-#, php-format
-msgid "Required objectclass '%s' is not present in LDAP setup"
-msgstr ""
-
-#: include/functions_setup.inc:122
-#, php-format
-msgid "Required objectclass '%s' does not have version %s"
-msgstr ""
-
-#: include/functions_setup.inc:133
-msgid "SAMBA 3 support disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:138
-msgid "SAMBA 3 support enabled"
-msgstr ""
-
-#: include/functions_setup.inc:143
-msgid "SAMBA 2 support disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:148
-msgid "SAMBA 2 support enabled"
-msgstr ""
-
-#: include/functions_setup.inc:154
-msgid "Support for pureftp disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:159
-msgid "Support for pureftp enabled"
-msgstr ""
-
-#: include/functions_setup.inc:164
-msgid "Support for WebDAV disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:169
-msgid "Support for WebDAV enabled"
-msgstr ""
-
-#: include/functions_setup.inc:174
-msgid "Support for phpgroupware disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:179
-msgid "Support for phpgroupware enabled"
-msgstr ""
-
-#: include/functions_setup.inc:184
-msgid "Support for trustAccount disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:189
-msgid "Support for trustAccount enabled"
-msgstr ""
-
-#: include/functions_setup.inc:194
-msgid "Support for gofon disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:199
-msgid "Support for gofon enabled"
-msgstr ""
-
-#: include/functions_setup.inc:204
-msgid "Support for nagios disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:209
-msgid "Support for nagios enabled"
-msgstr ""
-
-#: include/functions_setup.inc:214
-msgid "Support for netatalk disabled, no schema seems to be installed"
-msgstr ""
-
-#: include/functions_setup.inc:219
-msgid "Support for netatalk enabled"
-msgstr ""
-
-#: include/functions_setup.inc:229
-msgid ""
-"Support for Kolab disabled, no schema seems to be installed, setting mail-"
-"method to cyrus"
-msgstr ""
-
-#: include/functions_setup.inc:236
-msgid "Support for Kolab enabled"
-msgstr ""
-
-#: include/functions_setup.inc:257
-msgid "Ignored"
-msgstr ""
-
-#: include/functions_setup.inc:259 setup/class_setupStep_Migrate.inc:318
-#: setup/class_setupStep_Migrate.inc:468 setup/class_setupStep_Migrate.inc:481
-#: setup/class_setupStep_Migrate.inc:765
-#: setup/class_setupStep_Migrate.inc:1417
-#: setup/class_setupStep_Migrate.inc:1430
-msgid "Failed"
-msgstr ""
-
-#: include/functions_setup.inc:276
-msgid "PHP setup inspection"
-msgstr ""
-
-#: include/functions_setup.inc:278
-msgid "Checking for PHP version (>=4.1.0)"
-msgstr ""
-
-#: include/functions_setup.inc:279
-msgid ""
-"PHP must be of version 4.1.0 or above for some functions and known bugs in "
-"PHP language."
-msgstr ""
-
-#: include/functions_setup.inc:282
-msgid "Checking if register_globals is set to 'off'"
-msgstr ""
-
-#: include/functions_setup.inc:283
-msgid ""
-"register_globals is a PHP mechanism to register all global varibales to be "
-"accessible from scripts without changing the scope. This may be a security "
-"risk. GOsa will run in both modes."
-msgstr ""
-
-#: include/functions_setup.inc:286
-msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
-msgstr ""
-
-#: include/functions_setup.inc:287
-msgid ""
-"PHP uses this value for the garbage collector to delete old sessions, "
-"setting this value to one day will prevent loosing session and cookie  "
-"before they really timeout."
-msgstr ""
-
-#: include/functions_setup.inc:290
-msgid "Checking for ldap module"
-msgstr ""
-
-#: include/functions_setup.inc:291
-msgid "This is the main module used by GOsa and therefore really required."
-msgstr ""
-
-#: include/functions_setup.inc:294
-msgid "Checking for XML functions"
-msgstr ""
-
-#: include/functions_setup.inc:295
-msgid "XML functions are required to parse the configuration file."
-msgstr ""
-
-#: include/functions_setup.inc:298 setup/class_setupStep_Checks.inc:80
-msgid "Checking for gettext support"
-msgstr ""
-
-#: include/functions_setup.inc:299
-msgid "Gettext support is required for internationalized GOsa."
-msgstr ""
-
-#: include/functions_setup.inc:302 setup/class_setupStep_Checks.inc:88
-msgid "Checking for iconv support"
-msgstr ""
-
-#: include/functions_setup.inc:303
-msgid ""
-"This module is used by GOsa to convert samba munged dial informations and is "
-"therefore required."
-msgstr ""
-
-#: include/functions_setup.inc:306
-msgid "Checking for mhash module"
-msgstr ""
-
-#: include/functions_setup.inc:307
-msgid ""
-"To use SSHA encryption, you'll need this module. If you are just using crypt "
-"or md5 encryption, ignore this message. GOsa will run without it."
-msgstr ""
-
-#: include/functions_setup.inc:310
-msgid "Checking for imap module"
-msgstr ""
-
-#: include/functions_setup.inc:311
-msgid ""
-"The IMAP module is needed to communicate with the IMAP server. It gets "
-"status informations, creates and deletes mail users."
-msgstr ""
-
-#: include/functions_setup.inc:314
-msgid "Checking for getacl in imap"
-msgstr ""
-
-#: include/functions_setup.inc:315
-msgid ""
-"The getacl support is needed for shared folder permissions. The standard "
-"IMAP module is not capable of reading acl's. You need a recend PHP version "
-"for this feature."
-msgstr ""
-
-#: include/functions_setup.inc:318
-msgid "Checking for mysql module"
-msgstr ""
-
-#: include/functions_setup.inc:319
-msgid "MySQL support is needed for reading GOfax reports from databases."
-msgstr ""
-
-#: include/functions_setup.inc:322
-msgid "Checking for cups module"
-msgstr ""
-
-#: include/functions_setup.inc:323
-msgid ""
-"In order to read available printers from IPP protocol instead of printcap "
-"files, you've to install the CUPS module."
-msgstr ""
-
-#: include/functions_setup.inc:326
-msgid "Checking for kadm5 module"
-msgstr ""
-
-#: include/functions_setup.inc:327 setup/class_setupStep_Checks.inc:129
-msgid ""
-"Managing users in kerberos requires the kadm5 module which is downloadable "
-"via PEAR network."
-msgstr ""
-
-#: include/functions_setup.inc:330
-msgid "Checking for snmp Module"
-msgstr ""
-
-#: include/functions_setup.inc:331
-msgid ""
-"Simple Network Management Protocol (SNMP) is required for client monitoring."
-msgstr ""
-
-#: include/functions_setup.inc:368
-msgid "PHP detailed function inspection"
-msgstr ""
-
-#: include/functions_setup.inc:372
-#, php-format
-msgid "Checking for function %s"
-msgstr ""
-
-#: include/functions_setup.inc:373
-#, php-format
-msgid ""
-"The function %s is used by GOsa. There is no information if it's optional or "
-"required yet."
-msgstr ""
-
-#: include/functions_setup.inc:384
-msgid "Checking for some additional programms"
-msgstr ""
-
-#: include/functions_setup.inc:395
-msgid "Checking for GraphicsMagick (>=1.1.2)"
-msgstr ""
-
-#: include/functions_setup.inc:396
-msgid ""
-"GraphicsMagick is used to convert user supplied images to fit the suggested "
-"size and the unified JPEG format."
-msgstr ""
-
-#: include/functions_setup.inc:399
-msgid "Checking for ImageMagick (>=5.4.0)"
-msgstr ""
-
-#: include/functions_setup.inc:400
-msgid ""
-"ImageMagick is used to convert user supplied images to fit the suggested "
-"size and the unified JPEG format."
-msgstr ""
-
-#: include/functions_setup.inc:404
-msgid "Checking imagick module for PHP"
-msgstr ""
-
-#: include/functions_setup.inc:405
-msgid ""
-"Imagick is used to convert user supplied images to fit the suggested size "
-"and the unified JPEG format from PHP script."
-msgstr ""
-
-#: include/functions_setup.inc:412 setup/class_setupStep_Checks.inc:154
-msgid "Checking for fping utility"
-msgstr ""
-
-#: include/functions_setup.inc:413
-msgid ""
-"The fping utility is only used if you've got a thin client based terminal "
-"environment running."
-msgstr ""
-
-#: include/functions_setup.inc:428
-msgid "Checking for a way to generate LM/NT password hashes"
-msgstr ""
-
-#: include/functions_setup.inc:429
-msgid ""
-"In order to use SAMBA 2/3, you've to install some additional packages to "
-"generate password hashes."
-msgstr ""
-
-#: include/functions_setup.inc:442
-msgid "php.ini check -> session.auto_register"
-msgstr ""
-
-#: include/functions_setup.inc:443
-msgid ""
-"In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini must be set to 'Off'."
-msgstr ""
-
-#: include/functions_setup.inc:446
-msgid "php.ini check -> implicit_flush"
-msgstr ""
-
-#: include/functions_setup.inc:447
-msgid ""
-"This option influences the Output handling. Turn this Option off, to "
-"increase performance."
-msgstr ""
-
-#: include/functions_setup.inc:454
-msgid "php.ini check -> max_execution_time"
-msgstr ""
-
-#: include/functions_setup.inc:455
-msgid ""
-"The Execution time should be at least 30 seconds, because some actions may "
-"consume more time."
-msgstr ""
-
-#: include/functions_setup.inc:462
-msgid "php.ini check -> memory_limit"
-msgstr ""
-
-#: include/functions_setup.inc:463
-msgid ""
-"GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
-"Increase it for larger setups."
-msgstr ""
-
-#: include/functions_setup.inc:467
-msgid "php.ini check -> expose_php"
-msgstr ""
-
-#: include/functions_setup.inc:468
-msgid ""
-"Increase the server security by setting expose_php to 'off'. PHP won't send "
-"any Information about the server you are running in this case."
-msgstr ""
-
-#: include/functions_setup.inc:472
-msgid "php.ini check -> magic_quotes_gpc"
-msgstr ""
-
-#: include/functions_setup.inc:473 setup/class_setupStep_Checks.inc:243
-msgid ""
-"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
-"escape all quotes in strings in this case."
-msgstr ""
-
-#: include/functions_setup.inc:720 include/functions_setup.inc:831
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
-msgstr ""
-
-#: include/functions_setup.inc:734
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
-msgstr ""
-
-#: include/functions_setup.inc:792
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-
-#: include/functions_setup.inc:836
-msgid "Can't set ldap protocol version 3."
-msgstr ""
-
-#: include/functions_setup.inc:841
-msgid ""
-"Could not bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
-msgstr ""
-
-#: include/functions_setup.inc:924
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
-
-#: include/functions_setup.inc:933
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr ""
-
-#: include/functions_setup.inc:1112
-msgid ""
-"User and/or group could not be created, please check your configuration "
-"twice !"
-msgstr ""
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -13919,6 +13539,7 @@ msgid "Removing tag from object '%s'"
 msgstr ""
 
 #: include/sieve/class_sieveElement_Redirect.inc:24
+#: setup/class_setupStep_Feedback.inc:179
 msgid "Please specify a valid email address."
 msgstr ""
 
@@ -14391,7 +14012,7 @@ msgstr ""
 msgid "Please select the type of element you want to add"
 msgstr ""
 
-#: include/sieve/templates/add_element.tpl:13 setup/setup_migrate.tpl:192
+#: include/sieve/templates/add_element.tpl:13 setup/setup_migrate.tpl:198
 msgid "Abort"
 msgstr ""
 
@@ -14691,7 +14312,7 @@ msgid "Language setup"
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:42
-msgid "This step is allows you to select your prefered language."
+msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:47
@@ -14850,31 +14471,31 @@ msgstr ""
 msgid "Schema check failed"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:92
+#: setup/class_setupStep_Feedback.inc:91
 msgid "UNIX accounts/groups"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:94
+#: setup/class_setupStep_Feedback.inc:93
 msgid "Samba management"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:96
+#: setup/class_setupStep_Feedback.inc:95
 msgid "Mailsystem management"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:98
+#: setup/class_setupStep_Feedback.inc:97
 msgid "FAX system administration"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:100
+#: setup/class_setupStep_Feedback.inc:99
 msgid "Asterisk administration"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:102
-msgid "System invetory"
+#: setup/class_setupStep_Feedback.inc:101
+msgid "System inventory"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:104
+#: setup/class_setupStep_Feedback.inc:103
 msgid "System-/Configmanagement"
 msgstr ""
 
@@ -14887,8 +14508,27 @@ msgstr ""
 msgid "Get notifications or send feedback"
 msgstr ""
 
-#: setup/class_setupStep_Feedback.inc:177
-msgid "Could not send feedback."
+#: setup/class_setupStep_Feedback.inc:140
+#, php-format
+msgid ""
+"Could not connect to feedback server (%s). There is possibly no connection "
+"to the internet."
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:147
+msgid ""
+"Error while sending your feedback. The service is possible temporary "
+"unavailable"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:149
+msgid "Feedback sucessfully send"
+msgstr ""
+
+#: setup/class_setupStep_Feedback.inc:183
+msgid ""
+"You should have enabled at least one option, to subscribe or send your "
+"feedback."
 msgstr ""
 
 #: setup/setup_migrate.tpl:5
@@ -14918,120 +14558,122 @@ msgid ""
 "workstations that can't be migrated."
 msgstr ""
 
-#: setup/setup_migrate.tpl:66
+#: setup/setup_migrate.tpl:64 setup/setup_migrate.tpl:121
+#: setup/setup_migrate.tpl:172 setup/setup_migrate.tpl:296
+#: setup/setup_migrate.tpl:352
+msgid "Select all"
+msgstr ""
+
+#: setup/setup_migrate.tpl:65 setup/setup_migrate.tpl:122
+#: setup/setup_migrate.tpl:173 setup/setup_migrate.tpl:297
+#: setup/setup_migrate.tpl:353
+msgid "Select none"
+msgstr ""
+
+#: setup/setup_migrate.tpl:67
 msgid "Move selected windows workstations into the following GOsa department"
 msgstr ""
 
-#: setup/setup_migrate.tpl:71
+#: setup/setup_migrate.tpl:72
 msgid "Move selected workstations"
 msgstr ""
 
-#: setup/setup_migrate.tpl:72
+#: setup/setup_migrate.tpl:73
 msgid "What will be done here"
 msgstr ""
 
-#: setup/setup_migrate.tpl:84
+#: setup/setup_migrate.tpl:85
 msgid "Move groups into configured group tree"
 msgstr ""
 
-#: setup/setup_migrate.tpl:87
+#: setup/setup_migrate.tpl:88
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate.tpl:90
+#: setup/setup_migrate.tpl:91
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The GOsa setup can't migrate references, so you may want to cancel "
 "the migration in this case in this case."
 msgstr ""
 
-#: setup/setup_migrate.tpl:93
+#: setup/setup_migrate.tpl:94
 msgid "Move selected groups into this group tree"
 msgstr ""
 
-#: setup/setup_migrate.tpl:121 setup/setup_migrate.tpl:170
-#: setup/setup_migrate.tpl:312 setup/setup_migrate.tpl:366
+#: setup/setup_migrate.tpl:124 setup/setup_migrate.tpl:176
+#: setup/setup_migrate.tpl:300 setup/setup_migrate.tpl:356
 msgid "Hide changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl:123 setup/setup_migrate.tpl:172
-#: setup/setup_migrate.tpl:314 setup/setup_migrate.tpl:368
+#: setup/setup_migrate.tpl:126 setup/setup_migrate.tpl:178
+#: setup/setup_migrate.tpl:302 setup/setup_migrate.tpl:358
 msgid "Show changes"
 msgstr ""
 
-#: setup/setup_migrate.tpl:136
+#: setup/setup_migrate.tpl:139
 msgid "Move users into configured user tree"
 msgstr ""
 
-#: setup/setup_migrate.tpl:138
+#: setup/setup_migrate.tpl:141
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
 msgstr ""
 
-#: setup/setup_migrate.tpl:141
+#: setup/setup_migrate.tpl:144
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The GOsa setup can't migrate references, so you may want to cancel "
-"the migration in this case in this case."
+"the migration in this case."
 msgstr ""
 
-#: setup/setup_migrate.tpl:144
+#: setup/setup_migrate.tpl:147
 msgid "Move selected users into this people tree"
 msgstr ""
 
-#: setup/setup_migrate.tpl:191
+#: setup/setup_migrate.tpl:197
 msgid "Next"
 msgstr ""
 
-#: setup/setup_migrate.tpl:194
+#: setup/setup_migrate.tpl:200
 msgid "Create a new GOsa administrator account"
 msgstr ""
 
-#: setup/setup_migrate.tpl:197
+#: setup/setup_migrate.tpl:203
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
 msgstr ""
 
-#: setup/setup_migrate.tpl:226
+#: setup/setup_migrate.tpl:232
 msgid "Password (again)"
 msgstr ""
 
-#: setup/setup_migrate.tpl:236
-msgid "Assign super administrator permissions to an existing user or group"
-msgstr ""
-
-#: setup/setup_migrate.tpl:237
+#: setup/setup_migrate.tpl:260
 msgid ""
-"To grant administrative permissions to a user or a group, select an object "
-"and choose 'Assign'."
-msgstr ""
-
-#: setup/setup_migrate.tpl:275
-msgid ""
-"The listed deparmtents are currenlty invisble in the GOsa user interface. If "
+"The listed departments are currenlty invisble 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:276 setup/setup_migrate.tpl:329
+#: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:317
 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:286 setup/setup_migrate.tpl:338
+#: setup/setup_migrate.tpl:271 setup/setup_migrate.tpl:326
 msgid "Current"
 msgstr ""
 
-#: setup/setup_migrate.tpl:293 setup/setup_migrate.tpl:345
+#: setup/setup_migrate.tpl:278 setup/setup_migrate.tpl:333
 msgid "After migration"
 msgstr ""
 
-#: setup/setup_migrate.tpl:328
+#: setup/setup_migrate.tpl:316
 msgid ""
 "The listed users are currenlty invisble in the GOsa user interface. If you "
 "want to change this for a couple of users, just select them and use the "
@@ -15075,6 +14717,10 @@ msgid ""
 "your LDAP server."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:80
+msgid "Checking for gettext support"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:81
 msgid "Gettext support is required for internationalization."
 msgstr ""
@@ -15083,6 +14729,10 @@ msgstr ""
 msgid "Please make sure that the extension is activated."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:88
+msgid "Checking for iconv support"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
@@ -15099,8 +14749,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:98
 msgid ""
-"The mhash module for PHP 4/5 is not available.Pplease install php4-mhash/"
-"php5-mhash."
+"The mhash module for PHP 4/5 is not available.Please install php4-mhash/php5-"
+"mhash."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:104
@@ -15149,6 +14799,12 @@ msgstr ""
 msgid "Checking for kadm5 support"
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:129
+msgid ""
+"Managing users in kerberos requires the kadm5 module which is downloadable "
+"via PEAR network."
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:130
 msgid ""
 "This module is required to manage user in kerberos, it is downloadable via "
@@ -15181,6 +14837,10 @@ msgid ""
 "files, you've to install the CUPS module."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:154
+msgid "Checking for fping utility"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:155
 msgid ""
 "The fping utility is used if you've got a thin client based terminal "
@@ -15216,7 +14876,7 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:184
 msgid ""
-"register_globals is a PHP mechanism to register all global varibales to be "
+"register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
 msgstr ""
@@ -15295,6 +14955,12 @@ msgstr ""
 msgid "On"
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:243
+msgid ""
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes in strings in this case."
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:244
 msgid "Search for 'magic_quotes_gpc' in your php.ini and set it to 'On'."
 msgstr ""
@@ -15443,84 +15109,84 @@ msgstr ""
 msgid "Bind as user '%s' on server '%s' succeeded."
 msgstr ""
 
-#: setup/setup_feedback.tpl:4
+#: setup/setup_feedback.tpl:6
 msgid "Subscribe to the gosa-announce mailinglist"
 msgstr ""
 
-#: setup/setup_feedback.tpl:7
+#: setup/setup_feedback.tpl:9
 msgid ""
 "When checking this option, GOsa will try to connect http://oss.gonicus.de in "
 "order to subscribe you to the gosa-announce mailing list. You've to confirm "
 "this by mail."
 msgstr ""
 
-#: setup/setup_feedback.tpl:39
+#: setup/setup_feedback.tpl:41
 msgid "Send feedback to the GOsa project team"
 msgstr ""
 
-#: setup/setup_feedback.tpl:42
+#: setup/setup_feedback.tpl:44
 msgid ""
 "When checking this option, GOsa will try to connect http://oss.gonicus.de in "
 "order to submit your form anonymously."
 msgstr ""
 
-#: setup/setup_feedback.tpl:48
+#: setup/setup_feedback.tpl:50
 msgid "Did the setup procedure help you to get started?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:58
+#: setup/setup_feedback.tpl:60
 msgid "If not, what problems did you encounter"
 msgstr ""
 
-#: setup/setup_feedback.tpl:66
+#: setup/setup_feedback.tpl:68
 msgid "Is this the first time you use GOsa?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:72
+#: setup/setup_feedback.tpl:74
 msgid "I use it since"
 msgstr ""
 
-#: setup/setup_feedback.tpl:73
+#: setup/setup_feedback.tpl:75
 msgid "Select the year since when you are using GOsa"
 msgstr ""
 
-#: setup/setup_feedback.tpl:80
+#: setup/setup_feedback.tpl:82
 msgid "What operating system / distribution do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:88
+#: setup/setup_feedback.tpl:90
 msgid "What web server do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:96
+#: setup/setup_feedback.tpl:98
 msgid "What PHP version do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:104
+#: setup/setup_feedback.tpl:106
 msgid "LDAP"
 msgstr ""
 
-#: setup/setup_feedback.tpl:108
+#: setup/setup_feedback.tpl:110
 msgid "What kind of LDAP server(s) do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:114
+#: setup/setup_feedback.tpl:116
 msgid "How many objects are in your LDAP?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:121
+#: setup/setup_feedback.tpl:123
 msgid "Features"
 msgstr ""
 
-#: setup/setup_feedback.tpl:124
+#: setup/setup_feedback.tpl:126
 msgid "What features of GOsa do you use?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:134
+#: setup/setup_feedback.tpl:136
 msgid "What features do you want to see in future versions of GOsa?"
 msgstr ""
 
-#: setup/setup_feedback.tpl:141
+#: setup/setup_feedback.tpl:143
 msgid "Send feedback"
 msgstr ""
 
@@ -15641,64 +15307,7 @@ msgid "LDAP schema check"
 msgstr ""
 
 #: setup/class_setupStep_Schema.inc:42
-msgid "Perform test on your curren LDAP schema"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:138
-msgid "Used to store account specific informations."
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:145
-msgid ""
-"Used to lock currently edited entries to avoid multiple changes at the same "
-"time."
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:189
-#, php-format
-msgid "The required objectClass '%s' is not present in your schema setup"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:191
-#, php-format
-msgid "The optional objectClass '%s' is not present in your schema setup"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:197
-#, php-format
-msgid "The required objectclass '%s' does not have version %s"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:199
-#, php-format
-msgid "The optional objectclass '%s' does not have version %s"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:203
-#, php-format
-msgid "Class(es) available"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:228
-msgid ""
-"You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
-"schema configuration do not support this option."
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:229
-msgid ""
-"In order to use rfc2307bis corform groups the objectClass 'posixGroup' must "
-"be AUXILIARY"
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:233
-msgid ""
-"You have disabled the rfc2307bis option on the 'ldap setup' step, but your "
-"schema configuration do not support this option."
-msgstr ""
-
-#: setup/class_setupStep_Schema.inc:234
-msgid "The objectClass 'posixGroup' must be STRUCTURAL"
+msgid "Perform test on your current LDAP schema"
 msgstr ""
 
 #: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
@@ -15718,18 +15327,18 @@ msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
 #: setup/setup_language.tpl:3
-msgid "Please select the prefered language"
+msgid "Please select the preferred language"
 msgstr ""
 
 #: setup/setup_language.tpl:5
 msgid ""
-"At this point, you can select the site wide default langauge. Choosing "
+"At this point, you can select the site wide default language. Choosing "
 "'automatic' will use the language requested by the browser. This setting can "
 "be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl:9
-msgid "Please your prefered language here"
+msgid "Please your preferred language here"
 msgstr ""
 
 #: setup/setup_ldap.tpl:7
@@ -15828,190 +15437,229 @@ msgstr ""
 msgid "Snapshot base"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:106 setup/class_setupStep_Migrate.inc:107
+#: setup/class_setupStep_Migrate.inc:105 setup/class_setupStep_Migrate.inc:106
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:108
+#: setup/class_setupStep_Migrate.inc:107
 msgid "Analyze your current LDAP for GOsa compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:114
+#: setup/class_setupStep_Migrate.inc:113
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:120
+#: setup/class_setupStep_Migrate.inc:119
 msgid "Checking permissions on LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:126
+#: setup/class_setupStep_Migrate.inc:125
 msgid "Checking for invisible deparmtments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:132
+#: setup/class_setupStep_Migrate.inc:131
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:138
+#: setup/class_setupStep_Migrate.inc:137
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:144
+#: setup/class_setupStep_Migrate.inc:143
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:150
+#: setup/class_setupStep_Migrate.inc:149
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:156
+#: setup/class_setupStep_Migrate.inc:155
 msgid "Checking for windows workstations outside the winstation tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:162
+#: setup/class_setupStep_Migrate.inc:161
 msgid "Checking for duplicate uid numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:168
+#: setup/class_setupStep_Migrate.inc:167
 msgid "Checking for duplicate gid numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191 setup/class_setupStep_Migrate.inc:240
-#: setup/class_setupStep_Migrate.inc:302 setup/class_setupStep_Migrate.inc:348
-#: setup/class_setupStep_Migrate.inc:394 setup/class_setupStep_Migrate.inc:454
-#: setup/class_setupStep_Migrate.inc:538 setup/class_setupStep_Migrate.inc:668
+#: setup/class_setupStep_Migrate.inc:190 setup/class_setupStep_Migrate.inc:239
+#: setup/class_setupStep_Migrate.inc:301 setup/class_setupStep_Migrate.inc:347
+#: setup/class_setupStep_Migrate.inc:393 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:537 setup/class_setupStep_Migrate.inc:667
 #: setup/class_setupStep_Migrate.inc:757
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:192 setup/class_setupStep_Migrate.inc:241
-#: setup/class_setupStep_Migrate.inc:303 setup/class_setupStep_Migrate.inc:349
-#: setup/class_setupStep_Migrate.inc:395 setup/class_setupStep_Migrate.inc:455
-#: setup/class_setupStep_Migrate.inc:539 setup/class_setupStep_Migrate.inc:669
+#: setup/class_setupStep_Migrate.inc:191 setup/class_setupStep_Migrate.inc:240
+#: setup/class_setupStep_Migrate.inc:302 setup/class_setupStep_Migrate.inc:348
+#: setup/class_setupStep_Migrate.inc:394 setup/class_setupStep_Migrate.inc:454
+#: setup/class_setupStep_Migrate.inc:538 setup/class_setupStep_Migrate.inc:668
 #: setup/class_setupStep_Migrate.inc:758
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:214
+#: setup/class_setupStep_Migrate.inc:213
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:263
+#: setup/class_setupStep_Migrate.inc:262
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:320
+#: setup/class_setupStep_Migrate.inc:317 setup/class_setupStep_Migrate.inc:467
+#: setup/class_setupStep_Migrate.inc:480 setup/class_setupStep_Migrate.inc:807
+#: setup/class_setupStep_Migrate.inc:1531
+#: setup/class_setupStep_Migrate.inc:1544
+msgid "Failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:319
 #, php-format
 msgid ""
 "Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:321 setup/class_setupStep_Migrate.inc:549
-#: setup/class_setupStep_Migrate.inc:678
+#: setup/class_setupStep_Migrate.inc:320 setup/class_setupStep_Migrate.inc:548
+#: setup/class_setupStep_Migrate.inc:677
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:367
+#: setup/class_setupStep_Migrate.inc:366
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:368 setup/class_setupStep_Migrate.inc:414
+#: setup/class_setupStep_Migrate.inc:367 setup/class_setupStep_Migrate.inc:413
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:413
+#: setup/class_setupStep_Migrate.inc:412
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:470 setup/class_setupStep_Migrate.inc:483
+#: setup/class_setupStep_Migrate.inc:469 setup/class_setupStep_Migrate.inc:482
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:547
+#: setup/class_setupStep_Migrate.inc:546
 #, php-format
 msgid "Found %s user(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:597 setup/class_setupStep_Migrate.inc:729
+#: setup/class_setupStep_Migrate.inc:596 setup/class_setupStep_Migrate.inc:728
 #, php-format
 msgid ""
 "Failed to migrate the department '%s' into GOsa, error message is as follows "
 "'%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:677
+#: setup/class_setupStep_Migrate.inc:676
 #, php-format
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:766
+#: setup/class_setupStep_Migrate.inc:808
 msgid "There is no GOsa administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:828
+#: setup/class_setupStep_Migrate.inc:868
+msgid "Appending user to to group administrational group: \n"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:869
+msgid "Before"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:872
+msgid "After"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:879 setup/class_setupStep_Migrate.inc:902
 #, php-format
 msgid "Adding acls for user '%s' failed, ldap says '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:846
+#: setup/class_setupStep_Migrate.inc:893
+msgid ""
+"Creating new administrational group: \n"
+"\n"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:929
 msgid "Specified passwords are empty or not equal."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:914 setup/class_setupStep_Migrate.inc:962
+#: setup/class_setupStep_Migrate.inc:934
+msgid "Please specify a valid uid."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:972
+#, php-format
+msgid ""
+"Could not add administrative user, there is already an object with the same "
+"dn '%s' in your ldap database."
+msgstr ""
+
 #: setup/class_setupStep_Migrate.inc:1010
+#: setup/class_setupStep_Migrate.inc:1058
+#: setup/class_setupStep_Migrate.inc:1106
 msgid "Couldn't move users to specified department."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:924
+#: setup/class_setupStep_Migrate.inc:1020
 msgid "Winstation will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:924 setup/class_setupStep_Migrate.inc:972
 #: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1068
+#: setup/class_setupStep_Migrate.inc:1116
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:935 setup/class_setupStep_Migrate.inc:983
+#: setup/class_setupStep_Migrate.inc:1031
+#: setup/class_setupStep_Migrate.inc:1079
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:972
+#: setup/class_setupStep_Migrate.inc:1068
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1020
+#: setup/class_setupStep_Migrate.inc:1116
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1030
+#: setup/class_setupStep_Migrate.inc:1126
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1418
+#: setup/class_setupStep_Migrate.inc:1532
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1419
-#: setup/class_setupStep_Migrate.inc:1432
+#: setup/class_setupStep_Migrate.inc:1533
+#: setup/class_setupStep_Migrate.inc:1546
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1431
+#: setup/class_setupStep_Migrate.inc:1545
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1678
+#: setup/class_setupStep_Migrate.inc:1792
 #, php-format
 msgid "Failed to copy '%s' to '%s'. LDAP says '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1681
+#: setup/class_setupStep_Migrate.inc:1795
 msgid "Something went wrong while copying dns."
 msgstr ""