updated pot file

54 files changed, 3462 insertions, 2951 deletions

diff --git a/po/ar.po b/po/ar.po
index f9a38cb0..948874a5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-02 13:00+0100\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -27,8 +27,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "معالج التهيئة"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -37,8 +36,7 @@ msgid "Warning."
 msgstr "تحذير."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -48,10 +46,10 @@ msgstr "خطأ."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "تحذير\\nأنت في DHCP, الخادم قد لا يعمل بهذه التهيئة."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطأ"
 
@@ -296,7 +294,7 @@ msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -465,7 +463,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "خطأ:"
 
@@ -615,22 +613,27 @@ msgstr "اسم خادم البريد:"
 msgid "PXE server"
 msgstr "خادم PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "خادم سامبا"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "اختيار المعالج من Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "فضلاً اختر معالج"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -792,7 +795,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "قام المعالج بتهيئة خادم  FTP للإنترنت/الإنترانت بنجاح"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -889,6 +892,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "معالج تهيئة خادم الويب"
@@ -897,17 +907,21 @@ msgstr "معالج تهيئة خادم الويب"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "كلمة المرور:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "قام المعالج بتهيئة خدمة بريد الإنترنت لخادمك بنجاح."
@@ -917,27 +931,22 @@ msgstr "قام المعالج بتهيئة خدمة بريد الإنترنت ل
 msgid "Hostname:"
 msgstr "اسم المستضيف"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "إسم نطاق NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "جاري تهيئة خادم FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "خادم سامبا"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1196,7 +1205,7 @@ msgid ""
 msgstr ""
 "قام المعالج بتجميع المعاملات الآتية و الضرورية لتهيئة خدمة أخبار الإنترنت:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1500,24 +1509,24 @@ msgstr ""
 "يمكنك اختيار العنوان الذي سيظهره خادم البريد الصادر في حقول \"From:\" و "
 "\"Repy-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "اسم النظاق المحسوب"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "تحذير:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "لقد أدخلت عنواناً فارغاً لبوابة البريد."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1525,13 +1534,13 @@ msgstr ""
 "يمكن أن يتم قبول اختيارك, لكن هذا لن يسمح لك بإرسال البريد خارج الشبكة "
 "المحلية. اضغط التالي للمتابعة, أو رجوع لإدخال قيمة."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1542,43 +1551,43 @@ msgstr ""
 "اذا كان عنوان موفر خدمة الإنترنت لديك \"provider.com\" فخادم بريد الإنترنت "
 "عادة ما يكون \"smtp.provider.com/\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "بوابة بريد الإنترنت"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 "الخادم سيرسل البريد الصادر من خلال بوابة بريد, هذا ستولى الإرسال النهائي."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "اسم خادم البريد:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "جاري تهيئة البريد"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1586,35 +1595,35 @@ msgid ""
 msgstr ""
 "قام المعالج بتجميع المعلومات التالية و الضرورية لتهيئة خدمة بريد الإنترنت:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "هيئة العنوان"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "قام المعالج بتهيئة خدمة بريد الإنترنت لخادمك بنجاح."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "قام المعالج بتهيئة خادم البروكسي بنجاح."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "خادم Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "جاري تهيئة خادم FTP"
@@ -1840,7 +1849,7 @@ msgid "Set PXE server"
 msgstr "خادم NFS"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1852,7 +1861,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/az.po b/po/az.po
index 92bf9693..3fb7140a 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-20 18:30+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "quraşdırma sehirbazı"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Xəbərdarlıq."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Xəta"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -136,9 +134,9 @@ msgstr ""
 "bilər."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xəta"
 
@@ -298,7 +296,7 @@ msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdır
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -462,7 +460,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Xəta:"
 
@@ -608,15 +606,20 @@ msgstr "Mandrake Qurulum Vericisi"
 msgid "PXE server"
 msgstr "PXE vericisi"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba vericisi"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard sehirbaz seçkisi"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Xahiş edirik bir sehirbaz seçin"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -625,7 +628,7 @@ msgstr ""
 "%s qurulu deyil\n"
 "Qurmaq üçün \"Sonrakı\" ya da çıxmaq üçün \"Ləğv Et\" düyməsinə basın."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
@@ -785,7 +788,7 @@ msgstr "FXP-yə icazə ver"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Sehirbaz İntranet/İnternet FTP Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -885,6 +888,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Veb Vericisi Quraşdırma Sehirbazı"
@@ -893,17 +903,21 @@ msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -914,27 +928,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Verici Qovşaq Adı:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Nis Domeni:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba vericisi"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1200,7 +1209,7 @@ msgstr ""
 "İnternet Xəbərlər xidmətinizi quraşdırmaq üçün sehirbaz aşağıdakı "
 "parametrləri topladı:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1507,23 +1516,23 @@ msgstr ""
 "Gedən poçtun \"Göndərən:\" və \"Cavabla\" sahələrində göstəriləcək ünvan "
 "növünü seçə bilərsiniz."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskarad domen adı:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Xəbərdarlıq: "
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Poçt şəbəkə keçidi üçün boş ünvan daxil etdiniz."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1532,13 +1541,13 @@ msgstr ""
 "yollama imkanı verməyəcək. Davam etmək üçün sonrakı, qiymət daxil etmək üçün "
 "isə geri düyməsinə basın."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1548,12 +1557,12 @@ msgstr ""
 "üçün, əgər provayderiniz \"provider.com\" isə, internet poçt vericisi \"smtp."
 "provider.com\" olacaq."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "İnternet Poçt Şəbəkə Keçidi"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1561,31 +1570,31 @@ msgstr ""
 "Vericiniz gedən poçtları poçt şəbəkə keçişi vasitəsiylə göndərəcək, son "
 "çatdırmanı bu keçiş həll edəcək."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Poçt Vericisi Adı:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "İnternet Poçtu Quraşdırılır"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1594,37 +1603,37 @@ msgstr ""
 "Bu sehirbaz İnternet Poçt xidmətinizi quraşdırmaq üçün aşağıdakı "
 "parametrləri topladı:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Ünvanın Şəkli"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Sehirbaz vericinizin İnternet Poçt xidmətini müvəffəqiyyətlə quraşdırdı."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Sehirbaz vəkil vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Çap Vericisi:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "FTP Vericisi Quraşdırılır"
@@ -1852,7 +1861,7 @@ msgid "Set PXE server"
 msgstr "PXE vericisini seç"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1866,7 +1875,7 @@ msgid "Modify boot image in PXE"
 msgstr "təkmilləşdir - PXE-dəki əksi təkmilləşdir"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/bg.po b/po/bg.po
index 7387829c..2cc17f36 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-08-29 00:54+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Предупреждение"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr ""
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -133,9 +131,9 @@ msgstr ""
 "Внимание\\n Вие сте с dhcp,сървърът може да не работи с вашите настройки"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr ""
 
@@ -295,7 +293,7 @@ msgstr "Помощникът успешно настрои DHCP услугите
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -464,7 +462,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr ""
 
@@ -623,15 +621,20 @@ msgstr "FTP сървър"
 msgid "PXE server"
 msgstr "NFS сървър"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Сървър за база данни"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "ДракПомощник избор на помощник"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Моля изберете помощник"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -640,7 +643,7 @@ msgstr ""
 "%s не е инсталирано\n"
 "Натиснете \"Нататък\",за да инсталирате или \"Отказ\" за изход"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "инсталацията провалена"
@@ -798,7 +801,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Помощникът успешно настрои вашият Интранет/Интернет ftp сървър"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -895,6 +898,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Помощник за настройка на FTP сървър"
@@ -903,17 +913,21 @@ msgstr "Помощник за настройка на FTP сървър"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -924,26 +938,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Име на новинарския сървър:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Сървър за база данни"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1197,7 +1206,7 @@ msgstr ""
 "Помощникът събра следните параметри,необходими за настройката на вашия "
 "сървър за интернет новини:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1495,35 +1504,35 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Предупреждение:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Вие сте въвели празен адрес за пощенски портал."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1534,42 +1543,42 @@ msgstr ""
 "например,ако вашия доставчик е \"provider.com\", сървърът трябва да е \"news."
 "provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "FTP сървър"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Настройване на FTP сървър"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1578,37 +1587,37 @@ msgstr ""
 "Помощникът откри следните настройки,необходими за настройката на DNS "
 "услугата ви :"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Потребителско име:"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Помощникът успешно настрои вашата услуга \"интернет поща\" на сървъра ви."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "FTP сървър"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Настройване на FTP сървър"
@@ -1817,7 +1826,7 @@ msgid "Set PXE server"
 msgstr "NFS сървър"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1829,7 +1838,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/bs.po b/po/bs.po
index b844f62c..93674607 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-09-20 12:39+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -23,8 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,8 +33,7 @@ msgid "Warning."
 msgstr "Upozorenje"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -45,10 +43,10 @@ msgstr "Greška."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -139,9 +137,9 @@ msgstr ""
 "konfiguracijom."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Greška."
@@ -303,7 +301,7 @@ msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -475,7 +473,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Greška."
@@ -637,15 +635,20 @@ msgstr "Ime mail servera:"
 msgid "PXE server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server baze podataka"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard odabir čarobnjaka"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Molim odaberite čarobnjaka"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -654,7 +657,7 @@ msgstr ""
 "%s nije instaliran\n"
 "Kliknite na \"Sljedeći\" da ga instalirate ili \"Odustani\" za izlaz"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "instalacija nije uspjela"
@@ -814,7 +817,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -912,6 +915,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarobnjak za podešavanje Web servera"
@@ -920,17 +930,21 @@ msgstr "Čarobnjak za podešavanje Web servera"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Šifra:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
@@ -940,26 +954,21 @@ msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
 msgid "Hostname:"
 msgstr "Ime računara"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server baze podataka"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1217,7 +1226,7 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet news servisa:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1520,23 +1529,23 @@ msgstr ""
 "Možete izabrati tip adrese koju će izlazna pošta prikazivati u \"From:\" i "
 "\"Reply-to\" poljima."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskirano ime domena:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Upozorenje:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Unijeli ste praznu adresu za mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1544,13 +1553,13 @@ msgstr ""
 "Vaš izbor može biti prihvaćen, ali to će onemogućiti slanje maila izvan vaše "
 "lokalne mreže. Pritisnite Dalje za nastavak, ili Nazad da unesete nešto."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1560,12 +1569,12 @@ msgstr ""
 "primjer, ako je vaš provajder \"provajder.ba\", internet mail server je "
 "obično \"smtp.provajder.ba\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet mail gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1573,31 +1582,31 @@ msgstr ""
 "Vaš server će poslati izlazni mail kroz mail gateway, koji će se zatim "
 "pobrinuti za krajnju dostavu."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Ime mail servera:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Podešavanje Internet Mail-a"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1606,36 +1615,36 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet mail servisa:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Oblik adrese"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Čarobnjak je uspješno podesio proxy server."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Print server:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Podešavanje FTP servera"
@@ -1868,7 +1877,7 @@ msgid "Set PXE server"
 msgstr "NFS server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1880,7 +1889,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ca.po b/po/ca.po
index 7e87d2b8..6bcf0a6d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-04 20:17+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -23,8 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Auxiliar de configuració"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,8 +32,7 @@ msgid "Warning."
 msgstr "Avís."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -44,10 +42,10 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -133,9 +131,9 @@ msgstr ""
 "configuració."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -292,7 +290,7 @@ msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -462,7 +460,7 @@ msgstr ""
 "Sembla que el nom de màquina ja és a la teva configuració de DNS... prem "
 "següent per continuar"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Error:"
 
@@ -607,15 +605,20 @@ msgstr "Servidor d'instal·lació Mandrake"
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Servidor Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Selecció d'auxiliar Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Seleccioneu un auxiliar"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -624,7 +627,7 @@ msgstr ""
 "%s no està instal·lat\n"
 "Feu clic a \"Següent\" per instal·lar-lo o a \"Cancel·la\" per sortir"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
@@ -785,7 +788,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "L'auxiliar ha configurat el servidor FTP per a Intranet/Internet amb èxit"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -888,6 +891,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvingut a l'auxiliar de configuració del servidor Kolab Groupware"
 
@@ -895,16 +905,20 @@ msgstr "Benvingut a l'auxiliar de configuració del servidor Kolab Groupware"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Contrasenya un altre cop:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "L'auxiliar configurarà el servidor Kolab amb aquests paràmetres"
 
@@ -912,26 +926,21 @@ msgstr "L'auxiliar configurarà el servidor Kolab amb aquests paràmetres"
 msgid "Hostname:"
 msgstr "Nom de host:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Domini de correu:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "S'està configurant el servidor PXE al vostre sistema..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Servidor Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Servidor - Estableix la configuració del servidor LDAP"
@@ -1175,7 +1184,7 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents \n"
 "necessaris per configurar el servei de notícies d'Internet:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1470,23 +1479,23 @@ msgstr ""
 "Podeu triar el tipus d'adreça que el correu de sortida mostrarà en els camps "
 "\"De:\" i \"Respon a:\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nom de domini emmascarat:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Avís:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Heu introduït una adreça buida per a la passarel·la de correu."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1495,7 +1504,7 @@ msgstr ""
 "fora de la xarxa local. Premeu Següent per continuar, o Anterior per "
 "introduir un valor."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1503,7 +1512,7 @@ msgstr ""
 "Error, està instal·lat sendmail, elimina'l abans d'instal·lar i configurar "
 "Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1513,11 +1522,11 @@ msgstr ""
 "tipusdedomini\";per exemple, si el vostre proveïdor és \"proveïdor.com\", el "
 "servidor de correu d'internet generalment serà \"smtp.proveïdor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Passarel·la del correu d'Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1525,29 +1534,29 @@ msgstr ""
 "El vostre servidor enviarà el correu de sortida a través d'una passarel·la, "
 "que s'encarregarà de lliurar-lo finalment."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Nom del servidor de correu:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "S'està configurant el servidor de correu extern"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1555,33 +1564,33 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servei de correu extern:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Format de l'adreça"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "elmeuorigen"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "L'auxiliar configurarà ara un servidor de correu intern."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "L'auxiliar ha configurat amb èxit el vostre servidor de correu extern."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Servidor Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Comprova si sendmail està instal·lat per evitar conflictes..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "S'està configurant el vostre servidor Postfix....."
 
@@ -1811,7 +1820,7 @@ msgid "Set PXE server"
 msgstr "Configura servidor PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1823,7 +1832,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modifica imatge d'arrencada de PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/cs.po b/po/cs.po
index dde37625..23ec922a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-29 15:56+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -32,8 +32,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "průvodce nastavením"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -42,8 +41,7 @@ msgid "Warning."
 msgstr "Varování."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -53,10 +51,10 @@ msgstr "Chyba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -144,9 +142,9 @@ msgstr ""
 "Máte síť nastavenou v režimu DHCP, server nemusí s vaším nastavením fungovat."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
 
@@ -304,7 +302,7 @@ msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -485,7 +483,7 @@ msgstr ""
 "Zdá se, že počítač je ve vašem nastavení DNS už uveden... pokračujte "
 "stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Chyba:"
 
@@ -630,15 +628,20 @@ msgstr "Instalační server Mandrake"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Výběr průvodců"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Vyberte si prosím průvodce"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -647,7 +650,7 @@ msgstr ""
 "%s není nainstalován.\n"
 "Nainstalujte stiskem tlačítka \"Další\" nebo skončete tlačítkem \"Zrušit\""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
@@ -807,7 +810,7 @@ msgstr "Povolit FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Tento průvodce úspěšně nastavil váš FTP server pro Internet/Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Spusťte aplikaci drakwizard znovu a zkuste změnit některé parametry."
@@ -911,6 +914,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Průvodce nastavením webového serveru"
@@ -919,17 +929,21 @@ msgstr "Průvodce nastavením webového serveru"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Tento průvodce nyní upraví zaváděcí volby s těmito parametry:"
@@ -939,27 +953,22 @@ msgstr "Tento průvodce nyní upraví zaváděcí volby s těmito parametry:"
 msgid "Hostname:"
 msgstr "Název serveru:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS doména:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavuje se PXE server na vašem systému..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - Nastavení LDAP serveru"
@@ -1213,7 +1222,7 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné\n"
 "pro nastavení služby pro diskusní skupiny z Internetu:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1509,23 +1518,23 @@ msgstr ""
 "Můžete vybrat adresu, která se bude objevovat v odchozích dopisech v "
 "položkách\"From:\" (odesílatel) a \"Reply-To:\" (komu poslat odpověď)."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Maškaráda by měla obsahovat platnou doménu, např. \"mydomain.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Název maškarádované domény:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Varování:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Zadal jste prázdnou adresu pro poštovní bránu."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1534,7 +1543,7 @@ msgstr ""
 "lokální síť. Chcete-li pokračovat, stiskněte tlačítko Další, jinak stiskněte "
 "tlačítko Zpět a zadejte nějakou hodnotu."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1542,7 +1551,7 @@ msgstr ""
 "Chyba, je instalován sendmail, před instalací nebo nastavením serveru "
 "Postfix je třeba sendmail odstranit"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1552,11 +1561,11 @@ msgstr ""
 "pokud se například váš poskytovatel jmenuje \"poskytovatel.cz\", pak je "
 "obvykle název jeho poštovního serveru pro Internet \"smtp.poskytovatel.cz\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Brána pro poštu na Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1564,16 +1573,16 @@ msgstr ""
 "Váš server bude odesílat odchozí poštu skrze poštovní bránu, která se "
 "postará o konečné doručení."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Název poštovního serveru:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Implicitně je nastaveno připojení myhostname, což je v pořádku pro malé sítě."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1581,15 +1590,15 @@ msgstr ""
 "Parametr myorigin udává doménu, ze které se lokálně odeslaná pošta zdá, že "
 "pochází."
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Nastavuji externí poštovní server"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1597,34 +1606,34 @@ msgstr ""
 "Průvodce shromáždil následující údaje potřebné pro nastavení vašeho "
 "externího poštovního serveru:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Tvar adresy"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Průvodce nyní nastaví interní server elektronické pošty."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Tento průvodce úspěšně nastavil váš externí server elektronické pošty."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix server"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 "Kontroluje se instalace programu sendmail, aby se předešlo konfliktům..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Nastavuji váš server Postfix..."
 
@@ -1851,7 +1860,7 @@ msgid "Set PXE server"
 msgstr "Nastavení serveru PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1863,7 +1872,7 @@ msgid "Modify boot image in PXE"
 msgstr "Upravit zaváděcí obraz v PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/cy.po b/po/cy.po
index 04343d7d..e869fb6e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-01 22:42-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -18,8 +18,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "dewin ffurfweddu"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,8 +27,7 @@ msgid "Warning."
 msgstr "Rhybudd."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -39,10 +37,10 @@ msgstr "Gwall."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgstr ""
 "Rydych yn dhcp, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Gwall"
 
@@ -288,7 +286,7 @@ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -465,7 +463,7 @@ msgstr ""
 "Mae'n ymddangos fod y gwestai eisoes yn eich ffurfweddiad DNS...cliciwch "
 "Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Gwall:"
 
@@ -610,15 +608,20 @@ msgstr "Gweinydd Gosod Mandrake"
 msgid "PXE server"
 msgstr "Gweinydd PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Gweinydd Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Dewis dewin Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Dewiswch ddewin"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -627,7 +630,7 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
@@ -792,7 +795,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd FTP Mewnrwyd/Rhyngrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
@@ -897,6 +900,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Dewin Ffurfweddu Gweinydd Gwe"
@@ -905,17 +915,21 @@ msgstr "Dewin Ffurfweddu Gweinydd Gwe"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Cyfrinair:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Bydd y dewin yn newid y dewisiadau cychwyn gyda'r paramedrau hynny:"
@@ -925,27 +939,22 @@ msgstr "Bydd y dewin yn newid y dewisiadau cychwyn gyda'r paramedrau hynny:"
 msgid "Hostname:"
 msgstr "Enw gwestai'r Gweinydd"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Parth NIS::"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd PXE ar eich system..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Gweinydd Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Gweinydd - Gosod ffurfweddiad gweinydd LDAP"
@@ -1198,7 +1207,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaeth Newyddion Rhyngrwyd:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1504,23 +1513,23 @@ msgstr ""
 "Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym maes "
 "\"Oddi wrth:\" a \"Ateb i\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Dylai'r ffuiad fod yn enw parth dilys megis \"fymharth.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Enw parth ffug:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Rhybudd"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1529,14 +1538,14 @@ msgstr ""
 "allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu nôl i gynnig "
 "gwerth."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 "Gwall, mae sendmail wedi ei osod, dadosodwch sendmail a ffurfweddu Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1546,11 +1555,11 @@ msgstr ""
 "\"; e.e. os eich darparwr yw \"darparwr.com\", fel rheol y gweinydd e-bost "
 "rhyngrwyd yw \"newyddion.darparwr.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Porth e-bost rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1558,16 +1567,16 @@ msgstr ""
 "Bydd eich gweinydd yn anfon yr e-bost allfynd drwy borth e-bost, gan ofalu "
 "am y trosglwyddiad terfynol."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Enw gweinydd allanol::"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Y rhagosodiad yw ategu myhostname sy'n iawn ar gyfer safleoedd bychain."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1575,15 +1584,15 @@ msgstr ""
 "Mae paramedr myorigin yn enwi'r parth mae post lleol yn ymddangos yn dod "
 "ohono"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Ffurfweddu ar gyfer gweinydd e-bost allanol"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1591,34 +1600,34 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich gwasanaeth e-bost allanol:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Ffurf y cyfeiriad"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Bydd y dewin yn ffurfweddu eich gwasanaeth e-bost allanol"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr ""
 "Mae'r dewin wedi ffurfweddu eich gweinydd e-bost allanol yn llwyddiannus."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Gweinydd Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Gwiriwch os yw sendmail wedi ei osod, o osgoi gwrthdaro..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Ffurfweddu eich gweinydd Postfix"
 
@@ -1841,7 +1850,7 @@ msgid "Set PXE server"
 msgstr "Gosod gweinydd PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1853,7 +1862,7 @@ msgid "Modify boot image in PXE"
 msgstr "Newid delwedd cychwyn yn PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/da.po b/po/da.po
index 689ae4c4..8f113491 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-04 18:29+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurationshj�lper"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "Advarsel."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "Fejl."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fejl"
 
@@ -295,7 +293,7 @@ msgstr "Hj�lperen konfigurerede DHCP-tjenesterne uden problemer."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -476,7 +474,7 @@ msgstr ""
 "Det ser ud som om v�rten allerede er i din DNS-konfiguration... tryk n�ste "
 "for at forts�tte"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Fejl:"
 
@@ -623,15 +621,20 @@ msgstr "Mandrake Installationsserver"
 msgid "PXE server"
 msgstr "PXE-server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba-server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard hj�lpervalg"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Venligst v�lg en hj�lper"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -640,7 +643,7 @@ msgstr ""
 "%s er ikke installeret\n"
 "Klik \"N�ste\" for at installere eller \"Annull�r\" for at afslutte"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Installation mislykkedes"
 
@@ -801,7 +804,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Hj�lperen konfigurerede din Intranet/Internet FTP-server uden problemer"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Genstart drakwizard, og pr�v at �ndre nogen parametre."
@@ -905,6 +908,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Velkommen til konfigurationshj�lperen for Kolab gruppeprogrammel-serveren."
@@ -913,16 +923,20 @@ msgstr ""
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Adgangskode igen:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Hj�lperen vil nu konfigurere Kolab-serveren med disse parametre"
 
@@ -930,11 +944,11 @@ msgstr "Hj�lperen vil nu konfigurere Kolab-serveren med disse parametre"
 msgid "Hostname:"
 msgstr "V�rtsnavn:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Epost-dom�ne:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -943,16 +957,11 @@ msgstr ""
 "Kolab-serveren er nu konfigureret og k�rer. Logind som 'manager' med den "
 "adgangskode du indtastede."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer PXE-server p� dit system..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba-server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - Ops�t konfiguration af LDAP-server"
@@ -1205,7 +1214,7 @@ msgstr ""
 "Hj�lperen samlede de f�lgende parametre\n"
 "som beh�ves for at konfigurere din Internet nyheds-tjeneste:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1510,23 +1519,23 @@ msgstr ""
 "Du kan v�lge den slags adresser som udg�ende epost vil vise i \"From:\" og "
 "\"Reply-to\"-felterne."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Maskerade b�r v�re et gyldigt dom�nenavn som fx \"mitfirma.dk\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskarade dom�nenavn"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du indtastede en tom adresse for epost-gatewayen."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1535,7 +1544,7 @@ msgstr ""
 "udenfor dit lokale netv�rk. Tryk n�ste for at forts�tte, eller tilbage for "
 "at indtaste en v�rdi."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1543,7 +1552,7 @@ msgstr ""
 "fejl, sendmail er installeret, fjern det venligst f�r installering og "
 "konfigurering af Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1553,11 +1562,11 @@ msgstr ""
 "din udbyder er \"udbyder.dk\", er internet epost-serveren normalt \"smtp."
 "udbyder.dk\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet epost gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1565,16 +1574,16 @@ msgstr ""
 "Din server vil sende udg�ende post via en epost-gateway, denne vil tage h�nd "
 "om slutleveringen."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Navn p� e-postserver:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Standard er at tilf�je myhostname hvilket er fint for sm� installationer."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1582,15 +1591,15 @@ msgstr ""
 "Parameteren 'myorigin' angiver dom�net som den lokalt sendte epost ser ud "
 "til at komme fra"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Konfigurerer den eksterne epost-server"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1598,33 +1607,33 @@ msgstr ""
 "Hj�lperen indsamlede de f�lgende parametre som beh�ves for at konfigurere "
 "din eksterne epost-server:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Form p� adressen"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Hj�lperen vil nu konfigurere en intern epost-server."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Hj�lperen konfigurerede din eksterne epost-server uden problemer."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix-server"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Tjek om sendmail er installeret, for at undg� konflikt...."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurerer din Postfix-server....."
 
@@ -1848,7 +1857,7 @@ msgid "Set PXE server"
 msgstr "Indstil PXE-server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1860,7 +1869,7 @@ msgid "Modify boot image in PXE"
 msgstr "�ndr opstartsaftryk i PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/de.po b/po/de.po
index af39432d..972baf30 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-01-30 00:32+0100\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -30,8 +30,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurations-Assistent"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -40,8 +39,7 @@ msgid "Warning."
 msgstr "Warnung."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -51,10 +49,10 @@ msgstr "Fehler."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -144,9 +142,9 @@ msgstr ""
 "sein."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fehler"
 
@@ -309,7 +307,7 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -483,7 +481,7 @@ msgstr ""
 "Dieser Rechner ist wahrscheinlich schon in der DNS-Konfiguration vorhanden. "
 "Drücken Sie \"Weiter\" um fortzufahren."
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Fehler:"
 
@@ -629,15 +627,20 @@ msgstr "Mandrake Installations-Server"
 msgid "PXE server"
 msgstr "PXE-Server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba-Server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "DrakWizard Assistenten Auswahl"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Bitte wählen Sie einen Assistenten"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -646,7 +649,7 @@ msgstr ""
 "%s ist nicht installiert\n"
 "Wählen Sie \"Weiter\" für die Installation, oder \"Abbrechen\" zum Beenden."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Installation fehlgeschlagen"
 
@@ -815,7 +818,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Der Assistent hat den Intranet/Internet FTP-Server erfolgreich eingerichtet."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -924,6 +927,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web-Server Konfigurations-Assistent"
@@ -932,17 +942,21 @@ msgstr "Web-Server Konfigurations-Assistent"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Passwort:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Boot-Optionen im Image werden jetzt geändert"
@@ -952,27 +966,22 @@ msgstr "Boot-Optionen im Image werden jetzt geändert"
 msgid "Hostname:"
 msgstr "Host-Name"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS-Domäne:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguriere Ihren PXE-Server..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba-Server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "LDAP-Server konfigurieren"
@@ -1232,7 +1241,7 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter\n"
 "zusammengestellt, um Ihren Internet-News-Dienst einzurichten:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1540,23 +1549,23 @@ msgstr ""
 "Sie können die Art der Adresse wählen, die die ausgehende E-Mail im \"Von:"
 "\"- und \"Antwort an\"-Feld anzeigen wird."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquerading-Domänen-Name:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Warnung:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Sie gaben eine leere Adresse für den E-Mail-Gateway an."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1565,13 +1574,13 @@ msgstr ""
 "Mails nach außerhalb Ihres lokalen Netzwerkes zu senden. Drücken Sie \"Weiter"
 "\" um fortzufahren oder \"Zurück\" um eine Eingabe zu tätigen."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1581,12 +1590,12 @@ msgstr ""
 "werden, wenn Ihr Provider zum Beispiel \"provider.com\" ist, heißt der "
 "Internet-E-Mail-Server \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet-E-Mail-Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1594,34 +1603,34 @@ msgstr ""
 "Ihr Server wird die ausgehenden Nachrichten durch ein E-Mail-Gateway senden, "
 "der das weitere übernimmt."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "E-Mail-Server-Name:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 #, fuzzy
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Standardmässig wird '$myhostname' hinzugefügt, welches ideal für kleine "
 "Sites (Standorte) ist."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Konfiguriere den Internet-E-Mail-Server"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1630,37 +1639,37 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter gesammelt, die gebraucht werden um "
 "Ihr Internet-Mail-Dienst zu konfigurieren:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Form der Adresse"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Der Assistent hat Ihren Internet-E-Mail-Dienst Ihres Servers erfolgreich "
 "konfiguriert."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Der Assistent hat Ihren PXE-Server erfolgreich eingerichtet."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix-Server:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Konfiguriere Ihren Postfix-Server."
@@ -1894,7 +1903,7 @@ msgid "Set PXE server"
 msgstr "PXE-Server konfigurieren"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1906,7 +1915,7 @@ msgid "Modify boot image in PXE"
 msgstr "PXE-Boot-Image ändern"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 889982d7..7c0c0834 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+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"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr ""
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr ""
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -41,10 +39,10 @@ msgstr ""
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -119,9 +117,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr ""
 
@@ -265,7 +263,7 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -419,7 +417,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr ""
 
@@ -558,22 +556,26 @@ msgstr ""
 msgid "PXE server"
 msgstr ""
 
-#: ../drakwizard.pl:59
-msgid "Drakwizard wizard selection"
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+msgid "Kolab server"
 msgstr ""
 
 #: ../drakwizard.pl:60
+msgid "Drakwizard wizard selection"
+msgstr ""
+
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -719,7 +721,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -812,6 +814,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
@@ -819,16 +828,20 @@ msgstr ""
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
@@ -836,24 +849,20 @@ msgstr ""
 msgid "Hostname:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
-msgid "Kolab server"
-msgstr ""
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr ""
@@ -1082,7 +1091,7 @@ msgid ""
 "Internet News service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1354,105 +1363,105 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr ""
 
@@ -1649,7 +1658,7 @@ msgid "Set PXE server"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1661,7 +1670,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/el.po b/po/el.po
index 0583cdcb..3ebd455b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-01 14:48+0200\n"
 "Last-Translator: Dimitris Korbetis <korb@uth.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -19,8 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,8 +28,7 @@ msgid "Warning."
 msgstr "Προειδοποίηση"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -40,10 +38,10 @@ msgstr "Σφάλμα."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -130,9 +128,9 @@ msgstr ""
 "Είστε σε dhcp, ο διακομιστής μπορεί να μη λειτουργήσει με τις ρυθμίσεις σας."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -289,7 +287,7 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσ
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -453,7 +451,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Σφάλμα:"
 
@@ -593,15 +591,20 @@ msgstr "Εξυπηρετητής εγκατάστασης Mandrake "
 msgid "PXE server"
 msgstr "Εξυπηρετητής PXE:"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Εξυπηρετητής Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Επιλογή οδηγού Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Παρακαλώ επιλέξτε έναν οδηγό"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -610,7 +613,7 @@ msgstr ""
 "Το %s δεν είναι εγκατεστημένο επιλέξτε \"Επόμενο\" για εγκατάσταση η \"Άκυρο"
 "\" για έξοδο"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
@@ -770,7 +773,7 @@ msgstr "Άδεια FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή Διαδικτύου/Intranet FTP"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -867,6 +870,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
@@ -875,17 +885,21 @@ msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εσωτερικό εξυπηρετητή αλληλογραφίας"
@@ -895,27 +909,22 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εσωτερ
 msgid "Hostname:"
 msgstr "Όνομα εξυπηρετητή"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Τομέας NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Εξυπηρετητής Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1163,7 +1172,7 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία Ειδήσεων Διαδικτύου:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1459,24 +1468,24 @@ msgstr ""
 "Μπορείτε να επιλέξετε τη διεύθυνση θα εμφανίζεται στα πεδία \"Από:\" και "
 "\"Απάντηση σε\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Όνομα εξυπηρετητή αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Προειδοποίηση:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Εισάγατε κενή διεύθυνση για την πύλη αλληλογραφίας."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1485,13 +1494,13 @@ msgstr ""
 "μηνύματα εκτός του τοπικού σας δικτύου. Πατήστε επόμενο για συνέχεια ή άκυρο "
 "για να εισάγετε μια τιμή."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1501,11 +1510,11 @@ msgstr ""
 "domaintype\" π.χ. αν ο παροχέας σας είναι ο \"provider.com\", τότε ο "
 "διακομιστής αλληλογραφίας διαδικτύου είναι συνήθως  \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Διακομιστής αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1513,29 +1522,29 @@ msgstr ""
 "Ο διακομιστή σας θα στέλνει την εξερχόμενη αλληλογραφία μέσω μιας πύλης, που "
 "θα αναλαμβάνει την τελική παράδοση"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Όνομα εξυπηρετητή αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Ρυθμίζεται ο εξωτερικός εξυπηρετητής αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1543,33 +1552,33 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "τον εξωτερικό εξυπηρετητή Αλληλογραφίας Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "翻訳チームのメールアドレス:"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εσωτερικό εξυπηρετητή αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εξωτερικό εξυπηρετητή αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Εξυπηρετητής Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Ρυθμίσεις εξυπηρετητή Postfix"
 
@@ -1799,7 +1808,7 @@ msgid "Set PXE server"
 msgstr "Set PXE server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1811,7 +1820,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/eo.po b/po/eo.po
index 93acfd66..137b7d3d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-08-09 15:18+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,8 +31,7 @@ msgid "Warning."
 msgstr "Averto"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -44,10 +42,10 @@ msgstr "Sorĉil-eraro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgstr ""
 "Averto\\n Vi estas en dhcp, la servilo eble ne laboras kun via konfiguraĵo."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Sorĉil-eraro."
@@ -299,7 +297,7 @@ msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -471,7 +469,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Sorĉil-eraro."
@@ -630,22 +628,27 @@ msgstr "Nomo de poŝt-servilo:"
 msgid "PXE server"
 msgstr "NFS-servilo"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Datenbaz-servilo"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-sorĉilo-elekto"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Bonvole elektu sorĉilon"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -803,7 +806,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "La sorĉilo sukcese konfiguris vian intraretan/interretan FTP-servilon"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -901,6 +904,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
@@ -909,17 +919,21 @@ msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -930,26 +944,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Gastiganto-nomo"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Datenbaz-servilo"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1209,7 +1218,7 @@ msgstr ""
 "La sorĉilo kolektis sekvajn parametrojn bezonatajn por konfiguri vian "
 "interretan novaĵ-servon:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1512,24 +1521,24 @@ msgstr ""
 "Vi povas elekti la specon de adreso kiun eliranta poŝto montras en la kampo "
 "\"From:\" and \"Reply-to\" (\"De:\" kaj \"Respondo-al\")."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Averto:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vi enmetis malplenan adreson por la poŝt-kluzo."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1537,13 +1546,13 @@ msgstr ""
 "Via elekto akcepteblas, sed tio ne permesos vin sendi poŝtaĵon eksteren de "
 "via loka reto. Premo sekvan por daŭrigi, aŭ reen por enigi valoron."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1553,12 +1562,12 @@ msgstr ""
 "\"; ekz-e, se via provizanto estas \"provider.com\", la interreta poŝt-"
 "servilo estas kutime \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Interreta poŝt-kluzo"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1566,31 +1575,31 @@ msgstr ""
 "Via servilo sendos la eliraĵojn tra poŝta kluzo, tio zorgos pri la fina "
 "liverado."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Nomo de poŝt-servilo:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Mi konfiguras la interretan poŝton"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1599,37 +1608,37 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian "
 "interretan poŝt-servon:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Formo de la adreso"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "La sorĉilo sukcese konfiguris vian interretan poŝtservon de via servilo."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "La sorĉilo sukcese konfiguris vian prokur-servilon."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Presil-servilo:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Mi konfiguras la FTP-servilon"
@@ -1861,7 +1870,7 @@ msgid "Set PXE server"
 msgstr "NFS-servilo"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1873,7 +1882,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/es.po b/po/es.po
index a7c33c7e..484b2289 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-05 08:54-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -18,8 +18,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Asistente de configuraci�n"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,8 +27,7 @@ msgid "Warning."
 msgstr "Advertencia."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -39,10 +37,10 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgstr ""
 "Est� usando dhcp, puede que el servidor no funcione con su configuraci�n."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -290,7 +288,7 @@ msgstr "El asistente configur� exitosamente los servicios DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -472,7 +470,7 @@ msgstr ""
 "Parece que ese host ya est� en su configuraci�n DNS... persione siguiente "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Error:"
 
@@ -618,15 +616,20 @@ msgstr "Servidor de instalaci�n Mandrake"
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Servidor Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Selecci�n del asistente de Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Por favor, seleccione un asistente"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -635,7 +638,7 @@ msgstr ""
 "%s no est� instalado\n"
 "Pulse sobre �Siguiente� para instalarlo o sobre �Cancelar� para salir"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Fall� la instalaci�n"
 
@@ -796,7 +799,7 @@ msgstr "Permitir FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "El asistente configur� exitosamente su servidor FTP Intranet/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -901,6 +904,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bienvenido al asistente de configuraci�n del servidor Groupware Kolab."
 
@@ -909,16 +919,20 @@ msgstr "Bienvenido al asistente de configuraci�n del servidor Groupware Kolab."
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "RootDN es el administrador de su servidor LDAP"
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Contrase�a:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Contrase�a (de nuevo):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "El asistente configurar� ahora al servidor Kolab con estos par�metros"
 
@@ -926,11 +940,11 @@ msgstr "El asistente configurar� ahora al servidor Kolab con estos par�metros"
 msgid "Hostname:"
 msgstr "Nombre de host:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Dominio de correo:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -939,16 +953,11 @@ msgstr ""
 "El servidor Kolab ahora est� configurado y corriendo. Con�ctese como "
 "'manager' con la contrase�a que ingres�."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando servidor PXE en su sistema..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Servidor Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Servidor - Ajustar configuraci�n de servidor LDAP"
@@ -1201,7 +1210,7 @@ msgstr ""
 "El asistente recolect� los par�metros siguientes\n"
 "necesarios para configurar su servicio de Noticias de Internet:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1508,23 +1517,23 @@ msgstr ""
 "Puede seleccionar el tipo de direcci�n que mostar� el correo saliente en los "
 "campos \"De:\" y \"Responder-a\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "�El enmascarado deber�a ser un domino v�lido como \"midominio.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nombre de dominio enmascarado:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Advertencia:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Ha ingresado una direcci�n vacia para la pasarela de correo."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1533,7 +1542,7 @@ msgstr ""
 "de su red local. Presione Siguiente para continuar, o Anterior para ingresar "
 "un valor."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1541,7 +1550,7 @@ msgstr ""
 "Error, sendmail est� instalado, por favor qu�telo antes de instalar y "
 "configurar Postfix."
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1551,11 +1560,11 @@ msgstr ""
 "tipodedominio\"; por ejemplo, si su proveedor es \"proveedor.com\", el "
 "servidor de correo de Internet por lo general es \"smtp.proveedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Pasarela de correo de Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1563,16 +1572,16 @@ msgstr ""
 "Su servidor enviar� el correo saliente a trav�s de una pasarela de correo, "
 "la cual tomar� la responsabilidad del envio final."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Nombre del servidor de correo:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Lo predeterminado es a�adir myhostname, que est� bien para sitios peque�os."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1580,15 +1589,15 @@ msgstr ""
 "El par�metro myorigin especifica el dominio del cual parece venir el correo "
 "enviado localmente"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Configurando el servidor de correo externo"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1596,33 +1605,33 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servidor de correo externo:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Forma de la direcci�n"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "El asistente configurar� ahora un servidor de correo interno."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "El asistente configur� exitosamente su servidor de correo externo."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Servidor Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Verifique si sendmail est� instalado, para evitar conflictos..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Configurando su servidor Postfix..."
 
@@ -1851,7 +1860,7 @@ msgid "Set PXE server"
 msgstr "Configurar un servidor PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1863,7 +1872,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modificar imagen de arranque en PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/et.po b/po/et.po
index 77a75ff8..1fa72299 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-04 21:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,8 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "seadistuste nõustaja"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,8 +28,7 @@ msgid "Warning."
 msgstr "Hoiatus."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -40,10 +38,10 @@ msgstr "Viga."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Viga"
 
@@ -287,7 +285,7 @@ msgstr "Nõustaja seadistas edukalt DHCP teenused."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -466,7 +464,7 @@ msgstr ""
 "Paistab, et see masin on juba DNS seadistuses... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Viga:"
 
@@ -611,15 +609,20 @@ msgstr "Mandrake paigaldusserver"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizardi nõustaja valik"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Palun valige nõustaja"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -629,7 +632,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -782,7 +785,7 @@ msgstr "FXP lubamine"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP serveri"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
@@ -884,6 +887,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tere tulemast kasutama Kolabi grupitöö serveri seadistamise nõustajat."
 
@@ -891,16 +901,20 @@ msgstr "Tere tulemast kasutama Kolabi grupitöö serveri seadistamise nõustajat
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Parool teist korda:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Nõustaja seadistab nüüd Kolabi serveri järgmiselt:"
 
@@ -908,11 +922,11 @@ msgstr "Nõustaja seadistab nüüd Kolabi serveri järgmiselt:"
 msgid "Hostname:"
 msgstr "Masina nimi:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "E-posti domeen:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -921,16 +935,11 @@ msgstr ""
 "Kolabi server on nüüd seadistatud ja töötab. Logige sisse haldurina "
 "(manager), kasutades äsja sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Süsteemi seadistamine PXE serveriks..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - LDAP serveri seadistamine"
@@ -1183,7 +1192,7 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja\n"
 " uudistegruppide teenuse seadistamiseks:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1484,24 +1493,24 @@ msgstr ""
 "Võite valida aadressi, mida väljuv kiri näitab väljadel \"Kellelt:\" ja "
 "\"Vastus:\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Maskeraadi domeeni nimi peab olema korrektne, näiteks \"minudomeen.ee\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskeraadi domeeni nimi"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Hoiatus:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Meililüüsi aadress on tühi."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1510,7 +1519,7 @@ msgstr ""
 "oma kohtvõrku. Jätkamiseks vajutage nupule 'Järgmine' või nupule 'Tagasi', "
 "kui soovite midagi muuta."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1518,7 +1527,7 @@ msgstr ""
 "Viga, sendmail on paigaldatud, palun eemaldage see enne Postfixi "
 "paigaldamist ja seadistamist"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1528,11 +1537,11 @@ msgstr ""
 "näiteks teenusepakkuja on \"pakkuja.ee\", siis on meiliserver tavaliselt "
 "\"smtp.pakkuja.ee\" või \"mail.pakkuja.ee\""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Meililüüs"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1540,15 +1549,15 @@ msgstr ""
 "Server saadab väljuvad kirjad läbi meililüüsi, mis hoolitseb nende "
 "päralejõudmise eest."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Meiliserveri nimi:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "Vaikimisi lisatakse myhostname, mis kõlbab hästi väikestele kohtadele."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1556,15 +1565,15 @@ msgstr ""
 "Parameeter myorigin määrab domeeni, kust kohalikult postitatud meil näitab "
 "end tulevat"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Välise meiliserveri seadistamine"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1572,33 +1581,33 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja välise meiliserveri "
 "seadistamiseks:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Aadressi vorm"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Nõustaja seadistas edukalt Teie sisese meiliserveri."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Nõustaja seadistas edukalt Teie välise meiliserveri."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix server"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Konfliktide vältimiseks kontrollitakse, kas sendmail on paigaldatud..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Postfix serveri seadistamine..."
 
@@ -1821,7 +1830,7 @@ msgid "Set PXE server"
 msgstr "PXE serveri seadistamine"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1833,7 +1842,7 @@ msgid "Modify boot image in PXE"
 msgstr "PXE laadetõmmise muutmine"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/eu.po b/po/eu.po
index d8345632..caaaceb9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-01-01 18:21+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "ezarpen morroia"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Oharra."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -41,10 +39,10 @@ msgstr "Okerra."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgstr ""
 "egitea."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Okerra"
 
@@ -295,7 +293,7 @@ msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -468,7 +466,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Okerra"
@@ -623,15 +621,20 @@ msgstr "Posta zerbitzaria"
 msgid "PXE server"
 msgstr "Ezarri PXE zerbitzaria"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba zerbitzaria"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard morroi hautaketa"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Hautatu morroi bat mesedez"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -640,7 +643,7 @@ msgstr ""
 "%s ez dago instalatuta\n"
 "Klikatu \"Hurrengoa\" instalatzeko edo \"Utzi\" irtetzeko"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Instalazioak hutsegin du"
 
@@ -800,7 +803,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Morroiak zure Intranet/Internet FTP Zerbitzaria konfiguratu du"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -898,6 +901,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web Zerbitzari Ezarpen Morroia"
@@ -906,17 +916,21 @@ msgstr "Web Zerbitzari Ezarpen Morroia"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Pasahitza:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
@@ -926,27 +940,22 @@ msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
 msgid "Hostname:"
 msgstr "Ostalari Izena:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Nis Domeinua:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Zure sistema Nis Bezero bezala konfiguratzen ..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba zerbitzaria"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1205,7 +1214,7 @@ msgstr ""
 "Morroiak zure Interneteko Berrien Zerbitzua konfiguratzeko\n"
 "behar diren hurrengo parametroak bildu ditu:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1515,23 +1524,23 @@ msgstr ""
 "Aukeratu dezakezu kanporantz zuzendutako postak \"Nork:\" eta \"Erantzun-honi"
 "\" eremuetan erakutsiko duen helbide mota."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskarada domeinu izena:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Oharra:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Helbide hutsa sartu duzu posta atariarentzat."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1540,13 +1549,13 @@ msgstr ""
 "saretik kanpora bidali. Sakatu Hurrengoa jarraitzeko, edo Atzera balio bat "
 "sartzeko."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1556,12 +1565,12 @@ msgstr ""
 "behar dira; adibidez, zure hornitzailea \"hornitzailea.com\" bada, bere "
 "interneteko posta zerbitzaria normalean \"smtp.hornitzailea.com\" da."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Posta Ataria"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1569,31 +1578,31 @@ msgstr ""
 "Zure zerbitzariak kanporantz zuzendurikoa posta atari baten bitartez "
 "bidaliko du, honek hartuko du azke emanaldiaren ardura."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Posta Zerbitzari Izena:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Internet Posta konfiguratzen"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1602,36 +1611,36 @@ msgstr ""
 "Morroiak zure Internet Posta Zerbitzua konfiguratzeko behar diren hurrengo "
 "parametroak bildu ditu:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Helbidearen tankera"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Morroiak zure proxy zerbitzaria konfiguratu du."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Inprimaketa Zerbitzaria:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "FTP Zerbitzaria konfiguratzen"
@@ -1860,7 +1869,7 @@ msgid "Set PXE server"
 msgstr "Ezarri PXE zerbitzaria"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1874,7 +1883,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modify - Aldatu irudia PXE-n"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/fa.po b/po/fa.po
index ca0f2707..81bd3a6a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-09-10 01:04+0200\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "جادوگر پیکربندی"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "هشدار."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "خطا."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -129,9 +127,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "شما در dhcp هستید, کارگزار ممکن است با پیکربندی شما کار نکند."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطا"
 
@@ -289,7 +287,7 @@ msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارت
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -471,7 +469,7 @@ msgstr ""
 "بنظر می‌رسد که آن میزبان از قبل در پیکربندی DNS شما هست...بعدی را برای ادامه "
 "فشار دهید"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "خطا:"
 
@@ -619,15 +617,20 @@ msgstr "کارگزار نصب ماندرایک"
 msgid "PXE server"
 msgstr "کارگزار PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "کارگزار‌ سامبا"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "انتخاب جادوگر Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "لطفاً جادوگری را انتخاب کنید"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -636,7 +639,7 @@ msgstr ""
 "%s نصب نشده است\n"
 "\"بعدی\" را برای نصب یا \"لغو\" را برای ترک کردن کلیک کنید"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
@@ -805,7 +808,7 @@ msgstr "اجازه‌ی FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "جادوگر با موفقیت کارگزار FTP اینترنت/اینترانت شما را پیکربندی کرد"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -909,6 +912,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "جادوگر پیکربندی کارگزار وب"
@@ -917,17 +927,21 @@ msgstr "جادوگر پیکربندی کارگزار وب"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "گذرواژه:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "اکنون گزینه‌های آغازگری در تصویر سازگار خواهد گردید"
@@ -937,27 +951,22 @@ msgstr "اکنون گزینه‌های آغازگری در تصویر سازگا
 msgid "Hostname:"
 msgstr "نام میزبان"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "دامنه‌ی NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "پیکربندی کارگزار PXE بر سیستم شما..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "کارگزار‌ سامبا"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "کارگزار - گذاردن پیکربندی کارگزار LDAP"
@@ -1210,7 +1219,7 @@ msgstr ""
 "پارامترهای بدنبال آمده‌ی لازم را جادوگر برای پیکربندی\n"
 "سرویس اخبار اینترنت شما جمع آوری نمود:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1518,23 +1527,23 @@ msgstr ""
 "شما می‌توانید نوع نشانی را که پست ارسالی در منطقه‌های \"از:\" و \"جواب-به\" "
 "نشان خواهد داد انتخاب کنید."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "نام دامنه‌ی نقابی:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "هشدار:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "شما یک نشانی خالی برای دروازه‌ی پست وارد کردید."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1543,13 +1552,13 @@ msgstr ""
 "شبکه‌‌ی محلی‌تان را نمی‌دهد. بعدی را برای ادامه، یا برگشت را برای وارد کردن "
 "مقداری فشار دهید. "
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1559,12 +1568,12 @@ msgstr ""
 "مثال، اگر شرکت عرضه کننده‌ی اینترنت شما \"provider.com\" باشد, کارگزار پست "
 "اینترنت شما معمولاً \"smtp.provider.com\" می‌باشد."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "دروازه پست اینترنت"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1572,33 +1581,33 @@ msgstr ""
 "کارگزار شما پست ارسالی را به دروازه‌ی پست خواهد فرستاد، که ترتیب تحویل نهایی "
 "آنها را می‌دهد."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "نام کارگزار پست:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 #, fuzzy
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "پیش‌فرض پیوست $myhostname است که برای پایگاه‌های کوچک خوب است."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 "پارامتر myorigin دامنه‌ایی را که پست ارسال-محلی بنظر از آنجا می‌آید مشخص می‌کند"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "پیکربندی پست اینترنت"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1607,35 +1616,35 @@ msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی سرویس پست اینترنت شما "
 "جمع‌آوری کرد:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "شکل نشانی"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "این جادوگر با موفقیت سرویس پست اینترنتی کارگزار شما را پیکربندی کرد."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "جادوگر با موفقیت کارگزار PXE شما را پیکربندی کرد."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "کارگزار پسوند:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "پیکربندی کارگزار پسوندتان"
@@ -1860,7 +1869,7 @@ msgid "Set PXE server"
 msgstr "گذاردن کارگزار PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1872,7 +1881,7 @@ msgid "Modify boot image in PXE"
 msgstr "سازگار کردن تصویر آغازگری در PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/fi.po b/po/fi.po
index b070ee2c..69137148 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - MDK  10.0 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-07 16:46+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.xom>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "asetusvelho"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "Varoitus."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "Virhe."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Virhe"
 
@@ -296,7 +294,7 @@ msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -476,7 +474,7 @@ msgstr ""
 "Näyttää siltä että tuo kone on jo DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Virhe:"
 
@@ -621,15 +619,20 @@ msgstr "Mandrake Asennuspalvelin"
 msgid "PXE server"
 msgstr "PXE-palvelin"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba-palvelin"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard velhojen valinta"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Ole hyvä ja valitse velho"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -638,7 +641,7 @@ msgstr ""
 "%s ei ole asennettu.\n"
 "Paina \"Seuraava\" asentaaksesi tai \"Poistu\" lopettaaksesi."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
@@ -794,7 +797,7 @@ msgstr "Salli FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Velho asetti Intranet/Internet FTP-palvelimesi onnistuneesti"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
@@ -898,6 +901,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tervetuloa Kolab Groupware palvelimen asetusvelhoon"
 
@@ -905,16 +915,20 @@ msgstr "Tervetuloa Kolab Groupware palvelimen asetusvelhoon"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Salasana uudestaan:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Kolab-palvelinta asetetaan nyt näillä parametreilla."
 
@@ -922,11 +936,11 @@ msgstr "Kolab-palvelinta asetetaan nyt näillä parametreilla."
 msgid "Hostname:"
 msgstr "Konenimi:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Sähköposti verkkoalue:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -935,16 +949,11 @@ msgstr ""
 "Kolab palvelin on nyt asetettu ja käytössä. Kirjaudu tunnuksella 'manager' "
 "ja antamasi salasanalla."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi PXE-palvelinta..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba-palvelin"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Palvelin - Aseta LDAP palvelimen"
@@ -1195,7 +1204,7 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan\n"
 "Internet uutisryhmäpalvelun asettamiseksi:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1493,25 +1502,25 @@ msgstr ""
 "Voit valita osoitemuodon jonka lähtevä sähköposti näyttää kentissä: "
 "\"Keneltä (From)\" ja \"Vastausosoite (Reply-to)\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Maskeeratun verkkoalueen tulisi olla kelvollinen domain-nimi kuten "
 "\"nimiosoite.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskeeratun verkkoalueen nimi:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Varoitus:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Jätit sähköpostin yhdyskäytävä -asetuksen tyhjäksi."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1520,7 +1529,7 @@ msgstr ""
 "paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, tai 'Takaisin' "
 "korjataksesi asetuksia."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1528,7 +1537,7 @@ msgstr ""
 "Virhe, sendmail on asennettu, ole hyvä ja poista sitä ennen kuin asennat ja "
 "asetat Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1538,11 +1547,11 @@ msgstr ""
 "\"; eli jos esimerkiksi palveluntarjoajasi on \"tarjoaja.fi\", niin "
 "sähköpostipalvelimen nimi on yleensä \"smtp.tarjoaja.fi\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet sähköpostin yhdyskäytävä"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1550,15 +1559,15 @@ msgstr ""
 "Postipalvelimesi lähettää lähtevän postin postiyhdyskäytävän kautta, joka "
 "vastaa lopullisen lähetyksen perillemenosta."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Sähköpostipalvelimen nimi:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "Oletuksena lisätään myhostname joka rittää pienille verkoille."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1566,15 +1575,15 @@ msgstr ""
 "Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti lähetetyt "
 "viestit näyttää tulevan"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Asetetaan ulkoinen sähköpostipalvelin"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1582,33 +1591,33 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan ulkoisen Internet "
 "sähköpostipalvelimen asettamiseksi:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Osoitteen muoto"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Velho asettaa nyt Internet sähköpostipalvelinta."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Velho asetti ulkoisen sähköpostipalvelimen onnistuneesti."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix palvelin"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Tarkista jos sendmail on asennettu, ristiriitojen välttämiseksi..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Asetetaan Postfix-palvelimesi..."
 
@@ -1834,7 +1843,7 @@ msgid "Set PXE server"
 msgstr "Aseta PXE-palvelin"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1846,7 +1855,7 @@ msgid "Modify boot image in PXE"
 msgstr "Muokkaa PXE käynnistyskuvatiedosto"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/fr.po b/po/fr.po
index 4950e9d1..c006c592 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-11 07:30-0500\n"
 "Last-Translator: Pierre Soubourou <poupoune5@yahoo.fr>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -25,8 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistant de configuration"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -35,8 +34,7 @@ msgid "Warning."
 msgstr "Attention."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -46,10 +44,10 @@ msgstr "Erreur."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -136,9 +134,9 @@ msgstr ""
 "configuration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erreur"
 
@@ -205,8 +203,10 @@ msgid ""
 "eXecution Environment, a protocol that allows computers to boot through the "
 "network)."
 msgstr ""
-"Si vous voulez activer le PXE dans votre configuration DHCP cochez la case (Pre-boot\n"
-"execution Environment, un protocol qui perlet aux ordinteurs de demarrer par le reseau."
+"Si vous voulez activer le PXE dans votre configuration DHCP cochez la case "
+"(Pre-boot\n"
+"execution Environment, un protocol qui perlet aux ordinteurs de demarrer par "
+"le reseau."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by DHCP"
@@ -298,7 +298,7 @@ msgstr "L'assistant a configur� avec succ�s les services DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -479,7 +479,7 @@ msgstr ""
 "Il semble que cet h�te soit d�j� dans la configuration de votre DNS... "
 "Appuyez sur Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Erreur�:"
 
@@ -624,15 +624,20 @@ msgstr "Serveur d'installation Mandrake"
 msgid "PXE server"
 msgstr "Serveur de Boot (PXE)"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Serveur Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Choix de l'assistant Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Veuillez choisir un assistant"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -641,7 +646,7 @@ msgstr ""
 "le package %s n'est pas install�\n"
 "Cliquez sur ��Suivant�� pour l'installer ou ��Annuler�� pour quitter"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "L'installation a �chou�"
 
@@ -809,7 +814,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "L'assistant a configur� avec succ�s votre serveur FTP Intranet/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Relancez drakwizard en changeant quelques parametres."
@@ -886,8 +891,10 @@ msgid ""
 "a DHCP server with PXE support, and a PXE server. So it will be very easy to "
 "install Mandrake through a network."
 msgstr ""
-"Felicitation, le serveur d'installation Mandrake est desormais pret. Vous pouvez desormais\n"
-"configurer un serveur DHCP, puis un serveur PXE. Il sera alors tres facile d'installer Mandrakelinux\n"
+"Felicitation, le serveur d'installation Mandrake est desormais pret. Vous "
+"pouvez desormais\n"
+"configurer un serveur DHCP, puis un serveur PXE. Il sera alors tres facile "
+"d'installer Mandrakelinux\n"
 "par le reseau."
 
 #: ../installsrv_wizard/Installsrv.pm:143
@@ -919,8 +926,17 @@ msgid ""
 "provision for mailbox users as well as contacts and a POP3 as well as IMAP4"
 "(rev1) access to mail"
 msgstr ""
-"Kolab est un groupware securise et fiable. Il inclut principalement : une interface \n"
-"d'administration web, un carnet d'addresse partage, et un acces mail POP3 et IMAP4."
+"Kolab est un groupware securise et fiable. Il inclut principalement : une "
+"interface \n"
+"d'administration web, un carnet d'addresse partage, et un acces mail POP3 et "
+"IMAP4."
+
+#: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
@@ -931,18 +947,22 @@ msgstr "Assistant de configuration du serveur Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Entrez le mot de passe de l'administrateur Kolab."
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Mot de Passe :"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Mot de Passe :"
 
 # uncertain
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Modification des options d'amor�age pour l'image"
@@ -952,12 +972,12 @@ msgstr "Modification des options d'amor�age pour l'image"
 msgid "Hostname:"
 msgstr "Nom du serveur�:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Domaine NIS :"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
@@ -965,16 +985,11 @@ msgstr ""
 "Le serveur Kolab est desormais pret et configure. Logger vous en tant\n"
 "que 'manager' a l'adresse suivante https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurer le serveur PXE sur votre syst�me..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Serveur Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Serveur - Configuration du serveur LDAP"
@@ -1225,7 +1240,7 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants\n"
 "n�cessaires pour configurer votre Service de forums :"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1391,8 +1406,10 @@ msgid ""
 "build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
-"Un serveur NIS est tres utile pour creer une base de donnee d'utilisateurs et d'ordinateurs.\n"
-"Ce wizard permet aussi aux utilisateurs d'acceder a leur repertoire personnel depuis un\n"
+"Un serveur NIS est tres utile pour creer une base de donnee d'utilisateurs "
+"et d'ordinateurs.\n"
+"Ce wizard permet aussi aux utilisateurs d'acceder a leur repertoire "
+"personnel depuis un\n"
 "ordinateur client NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
@@ -1446,7 +1463,9 @@ msgstr "Serveur NIS : nom d'h�te du serveur NIS"
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
-msgstr "Le demon YPBIND trouve le serveur de domain NIS, et se synchronise avec ses informations."
+msgstr ""
+"Le demon YPBIND trouve le serveur de domain NIS, et se synchronise avec ses "
+"informations."
 
 # I had to modify that one a bit...
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1543,23 +1562,23 @@ msgstr ""
 "Vous pouvez s�lectionner le format d'adresse que les messages sortants vont "
 "avoir dans les champs ��From:�� et ��Reply-to��."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Masquerade doit etre un nom de domain valide tel que mydomain.com."
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquage du nom de domaine :"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Attention :"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vous avez saisi une adresse vide pour la passerelle. Vous risquez de"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1568,7 +1587,7 @@ msgstr ""
 "courrier hors de votre r�seau local. Cliquez sur Suivant pour continuer, ou "
 "Pr�c�dent pour modifier."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1576,7 +1595,7 @@ msgstr ""
 "Erreur, Sendmail est install�. Veuillez le d�sinstaller avant d'installer et "
 "de configurer Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1586,12 +1605,12 @@ msgstr ""
 "typedomaine��; par exemple, si votre fournisseur est ��fournisseur.fr��, le "
 "serveur de courrier est souvent ��smtp.fournisseur.fr��."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Passerelle Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1599,18 +1618,18 @@ msgstr ""
 "Votre serveur va envoyer tous les messages sortants vers une passerelle, qui "
 "s'occupera de la livraison finale."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Passerelle pour la messagerie�:"
 
 # don't know if I should leave 'myhostname' in english or translate it in french
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "Par d�faut, ajouter myhostname qui convient pour les petits sites."
 
 # don't know if I should translate 'myorigin', see next item
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1618,16 +1637,16 @@ msgstr ""
 "Le param�tre myorigin sp�cifie le domaine d'o� les courriers �lectroniques "
 "paraissent avoir �t� envoy�s"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Configuration du serveur de messagerie Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1636,40 +1655,40 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre Service de Courrier �lectronique :"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forme de l'adresse�:"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "L'assistant a configur� avec succ�s les services de messagerie Internet pour "
 "votre r�seau."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "L'assistant a configur� avec succ�s le serveur PXE."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Serveur Postfix"
 
 # the msgid has got four dots instead of three
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "V�rifier que Sendmail est install�, pour �viter les conflits..."
 
 # too many dots in the msgid
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Configuration du serveur Postfix..."
 
@@ -1900,7 +1919,7 @@ msgid "Set PXE server"
 msgstr "Configurer un serveur PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1912,7 +1931,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modifier l'image de d�marrage de PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
@@ -1951,7 +1970,8 @@ msgid ""
 "PXE description is used to explain the rule of the boot image, ie: Mandrake "
 "10 image, Mandrake cooker image.."
 msgstr ""
-"La description PXE est utilise pour definir le role de l'image, par exemple:\n"
+"La description PXE est utilise pour definir le role de l'image, par "
+"exemple:\n"
 "image de boot Mandrake 10, image de boot Mandrake cooker.."
 
 #: ../pxe_wizard/Pxe.pm:132
@@ -1972,8 +1992,10 @@ msgid ""
 "need to name this image, so each boot image is related to a name in PXE "
 "menu. User can then choose which image he wants to boot through PXE."
 msgstr ""
-"Pour demarrer par le reseau, l'ordinateur client a besoin d'une image de boot. Nous\n"
-"allons distinguer ces images en les associant a des noms. L'utilisteur pourra donc choisir \n"
+"Pour demarrer par le reseau, l'ordinateur client a besoin d'une image de "
+"boot. Nous\n"
+"allons distinguer ces images en les associant a des noms. L'utilisteur "
+"pourra donc choisir \n"
 "l'image qu'il voudra demarrer par PXE."
 
 #: ../pxe_wizard/Pxe.pm:142
@@ -1987,7 +2009,8 @@ msgid ""
 "boot network computer through a kernel (vmlinuz), and provide one file with "
 "all drivers needed (in our case all.rdz)."
 msgstr ""
-"Dans certain cas, il est plus simple de demarrer l'ordinateur sur un noyau (vmlinuz), et de fournir\n"
+"Dans certain cas, il est plus simple de demarrer l'ordinateur sur un noyau "
+"(vmlinuz), et de fournir\n"
 "un fichier contenant tous les pilotes necessaires (dans notre cas all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:142
@@ -2008,8 +2031,10 @@ msgid ""
 "to name this image, so each boot image is related to a name in PXE menu. So "
 "user can choose wich image he wants to boot through PXE."
 msgstr ""
-"Pour demarrer par le reseau, l'ordinateur client a besoin d'une image de boot. Nous\n"
-"allons distinguer ces images en les associant a des noms. L'utilisteur pourra donc choisir\n"
+"Pour demarrer par le reseau, l'ordinateur client a besoin d'une image de "
+"boot. Nous\n"
+"allons distinguer ces images en les associant a des noms. L'utilisteur "
+"pourra donc choisir\n"
 "l'image qu'il voudra demarrer par PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
@@ -2039,7 +2064,9 @@ msgstr "Ajouter une option � l'image de d�marrage�:"
 msgid ""
 "In some cases, you want to add some options to the PXE boot image. This "
 "wizard provides an easy way to customize a boot image with common parameters."
-msgstr "Dans certain cas l'administrateur veux ajouter des options aux images de demarrage PXE. Ce wizard permet facilement de changer ces options."
+msgstr ""
+"Dans certain cas l'administrateur veux ajouter des options aux images de "
+"demarrage PXE. Ce wizard permet facilement de changer ces options."
 
 #: ../pxe_wizard/Pxe.pm:161
 #, fuzzy
@@ -2154,9 +2181,12 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
-"Nous avons besoin d'utiliser un serveur DHCP supportant le mode PXE. Pour le configurer,\n"
-" lancez juste le wizard DHCP et cochez la case 'activer le support PXE'. Si votre\n"
-"serveur DHCP n'a pas le support PXE active, ce n'est pas lui qui repondra aux requetes PXE\n"
+"Nous avons besoin d'utiliser un serveur DHCP supportant le mode PXE. Pour le "
+"configurer,\n"
+" lancez juste le wizard DHCP et cochez la case 'activer le support PXE'. Si "
+"votre\n"
+"serveur DHCP n'a pas le support PXE active, ce n'est pas lui qui repondra "
+"aux requetes PXE\n"
 "sur le reseau."
 
 #: ../pxe_wizard/Pxe.pm:196
@@ -2164,7 +2194,8 @@ msgid ""
 "Please provide a bootable image. To boot through a network, network "
 "computers need a boot image."
 msgstr ""
-"Fournissez un image de demarrage SVP. Les ordinateurs clients PXE ont besoin \n"
+"Fournissez un image de demarrage SVP. Les ordinateurs clients PXE ont "
+"besoin \n"
 "d'une image de demarrage reseau."
 
 #: ../pxe_wizard/Pxe.pm:200
@@ -2177,8 +2208,10 @@ msgid ""
 "one on the first CD of the Mandrakelinux distribution, in the /isolinux/"
 "alt0/ directory."
 msgstr ""
-"SVP fournissez une image all.rdz, contenant tous les pilotes. Vous pouvez en \n"
-"trouvez une sur le premier CD d'installation de Mandrakelinux, dans le repertoire:\n"
+"SVP fournissez une image all.rdz, contenant tous les pilotes. Vous pouvez "
+"en \n"
+"trouvez une sur le premier CD d'installation de Mandrakelinux, dans le "
+"repertoire:\n"
 "/isolinux/alt0/"
 
 #: ../pxe_wizard/Pxe.pm:212 ../pxe_wizard/Pxe.pm:216
diff --git a/po/he.po b/po/he.po
index bd51098d..6ec46198 100644
--- a/po/he.po
+++ b/po/he.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-09 21:03+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -24,8 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "אשף הגדרות"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,8 +33,7 @@ msgid "Warning."
 msgstr "אזהרה."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -45,10 +43,10 @@ msgstr "שגיאה"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -127,9 +125,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצורה זו."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "שגיאה"
 
@@ -280,7 +278,7 @@ msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של �
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -453,7 +451,7 @@ msgid ""
 msgstr ""
 "נראה כי הלקוח כבר מופיע בתצורת ה DNS שלך... עליך לבחור \"הבא\" בכדי להמשיך"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "שגיאה:"
 
@@ -596,15 +594,20 @@ msgstr "שרת התקנה של Mandrake"
 msgid "PXE server"
 msgstr "שרת PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "שרת Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "בחירת אשף Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "נא לבחור אחד מהאשפים"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -613,7 +616,7 @@ msgstr ""
 "%s לא מותקן\n"
 "נא ללחוץ \"הבא\" בכדי להתקין, או \"ביטול\" כדי לצאת"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
@@ -766,7 +769,7 @@ msgstr "אפשר FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-FTP שלך עבור האינטרנט/רשת מקומית"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "עליך להריץ מחדש את drakwizard, ולנסות לשנות מספר הגדרות."
@@ -864,6 +867,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "ברוך בואך לאשף הגדרת השרת של המערכת לקבוצות עבודה Kolab."
 
@@ -871,16 +881,20 @@ msgstr "ברוך בואך לאשף הגדרת השרת של המערכת לקב�
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "סיסמה (שוב):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "האשף יגדיר כעת את תצורת שרת Kolab לפי המאפיינים שהוגדרו"
 
@@ -888,11 +902,11 @@ msgstr "האשף יגדיר כעת את תצורת שרת Kolab לפי המאפ�
 msgid "Hostname:"
 msgstr "שם המחשב:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "מתחם הדוא\"ל:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -901,16 +915,11 @@ msgstr ""
 "שרת Kolab מוגדר ופועל כעת. עליך להתחבר למערכת בשם משתמש 'manager' עם הסיסמה "
 "שהגדרת."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "הגדרת שרת PXE על המערכת שלך..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "שרת Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "שרת - הגדרת תצורה של שרת LDAP"
@@ -1157,7 +1166,7 @@ msgid ""
 "Internet News service:"
 msgstr "האשף אסף את הנתונים הבאים הנדרשים בכדי להגדיר את שרת קבוצות הדיון שלך:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1448,23 +1457,23 @@ msgstr ""
 "יש באפשרותך לבחור את סוג הכתובות שייראו בדואר יוצא בשדה ה\"מאת:\" ובשדה ה"
 "\"כתובת לתשובה\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "ערך Masquerade צריך להיות שם מתחם תקין כגון \"mydomain.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "מסיכת שם מתחם"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "אזהרה:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "לא הוגדרה כתובת כלשהי עבור שרת הדואר (שדה הכתובת ריק)."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1472,7 +1481,7 @@ msgstr ""
 "בחירה זו אפשרית, אולם היא לא תאפשר משלוח דוא\"ל מחוץ לרשת המקומית. נא לבחור "
 "\"המשך\" או \"חזור\" על-מנת להכניס ערך."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1480,7 +1489,7 @@ msgstr ""
 "חלה שגיאה, קיימת התקנת sendmail. עליך להסיר תוכנה זו לפני התקנת והגדרת "
 "postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1490,71 +1499,71 @@ msgstr ""
 "הספק שלך הוא \"provider.com\", אזי שם שרת הדואר האינטרנטי יהיה בדרך-כלל "
 "\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "שער לדואר אינטרנטי"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "השרת שלך ישלח דוא\"ל יוצא דרך שרת דואר יוצא, שיטפל במשלוח ליעד הסופי."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "שם שרת הדואר:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "ברירת המחדל היא לשרשר myhostname שהיא בחירה מתאימה לאתרים קטנים."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr "פרמטר myorigin מגדיר את המתחם המופיע כמקור דוא\"ל שנשלח ממקור מקומי."
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "הגדרת שרת דואר חיצוני"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "אשף זה אסף את הנתונים הבאים הנדרשים להגדרת שרת הדואר החיצוני:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "מבנה הכתובת"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "אשף זה יגדיר כעת שרת דואר פנימי."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת הדואר החיצוני שלך."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "שרת Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "נא לבדוק האים sendmail מותקן למניעת התנגשות..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "הגדרת שרת ה-Postfix שלך....."
 
@@ -1771,7 +1780,7 @@ msgid "Set PXE server"
 msgstr "הגדרת שרת PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1783,7 +1792,7 @@ msgid "Modify boot image in PXE"
 msgstr "שינוי תמונת אתחול ב PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/hi.po b/po/hi.po
index d0746b66..83bb7992 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-08 16:04+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -24,8 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "संरचना विज़ार्ड"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,8 +33,7 @@ msgid "Warning."
 msgstr "चेतावनी ।"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -45,10 +43,10 @@ msgstr "त्रुटि ।"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -133,9 +131,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "आप डीएचसीपी में है, सर्वर इस संरचना के साथ हो सकता है कि कार्य ना करें ।"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -292,7 +290,7 @@ msgstr "जादूगरी ने डीएचसीपी सेवाओं
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -469,7 +467,7 @@ msgstr ""
 "ऐसा लगता है कि होस्ट पहिले से ही आपके डीएनएस संरचना में है...अगला बटन को जारी रखने के "
 "लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "त्रुटि:"
 
@@ -614,15 +612,20 @@ msgstr "मैनड्रैक संसाधन सर्वर"
 msgid "PXE server"
 msgstr "पीएक्सई सर्वर"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "सॉबा सर्वर"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "ड्रैकविज़ार्ड जादूगरी चयन"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "कृपया एक जादूगरी का चयन करें"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -631,7 +634,7 @@ msgstr ""
 "%s संसाधित नहीं है\n"
 "संसाधन के लिए \"अगला\" पर क्लिक करें या बाहर निकलने के लिए  \"निरस्त\" पर"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल रहा"
 
@@ -789,7 +792,7 @@ msgstr "एफ़एक्सपी को अनुमति"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट एफ़टीपी सर्वर को सफ़लता-पूर्वक संरचित दिया है"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -893,6 +896,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "कोलैब ग्रूपवेयर सर्वर संरचना जादूगरी में स्वागत ।"
 
@@ -900,16 +910,20 @@ msgstr "कोलैब ग्रूपवेयर सर्वर संरच
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "कूट-शब्द पुनः बतायें:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "इन पैरामीटरों के साथ विजार्ड अब कोलैब सर्वर को संरचित करेगा"
 
@@ -917,11 +931,11 @@ msgstr "इन पैरामीटरों के साथ विजार�
 msgid "Hostname:"
 msgstr "होस्टनाम:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "विपत्र डोमेन:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -930,16 +944,11 @@ msgstr ""
 "कोलैब सर्वर अब संरचित है और चल रहा है । अपने बताये हुए कूट-शब्द को इन्टरकरते हुए 'प्रबंधक' "
 "की भांति सत्र आरम्भ करें।"
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "आपके तंत्र पर पीएक्सई सर्वर को संरचित किया जा रहा है ..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "सॉबा सर्वर"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "सर्वर - एलडीऐपी सर्वर की संरचना की स्थापना"
@@ -1190,7 +1199,7 @@ msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है \n"
 "जो कि आपके इन्टरनेट समाचार सेवा को संरचित करने के लिए आवश्यक है:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1497,23 +1506,23 @@ msgstr ""
 "आप पते का प्रकार का चयन कर सकते है जिसे बर्हिगमन विपत्र  \"द्वारा:\" और \"को-उत्तर\" "
 "प्रविष्टियों में दिखायेगी।"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "मासक्यूरेड को एक वैध डोमेन नाम होना चाहिए जैसा कि \"mydomain.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "मासक्यूरेड डोमेन का नाम"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "चेतावनी:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "आपने विपत्र द्वार के लिए एक शून्य पता बताया है।"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1522,13 +1531,13 @@ msgstr ""
 "विपत्र भेजने की अनुमति नहीं देगी। जारी रखने के लिए अगला बटन को दबायें, या एक मूल्य को "
 "बताने के लिए, पिछला को।"
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr "त्रुटि, सेन्डमेल संसाधित है, कृपया संसाधन के पूर्व इसे हटायें और पोस्टफ़िक्स को संरचित करें"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1538,11 +1547,11 @@ msgstr ""
 "यदि आपका प्रदानकर्ता \"प्रदानकर्ता.कॉम\" है, तो इन्टरनेट विपत्र सर्वर सामान्यता "
 "\"एसएमटीपी.प्रदानकर्ता.कॉम\" होगा।"
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "इन्टरनेट विपत्र गेटवे"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1550,32 +1559,32 @@ msgstr ""
 "आपका सर्वर बाहर जाने वाली को एक विपत्र द्वार से भेजेगी, यह अंतिम प्रतिपादन का ख्याल "
 "रखेगी।"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "विपत्र सर्वर नाम:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "माईहोस्टनाम (myhostname) को सबसे अंत में जोड़ना डिफ़ाल्ट है जो कि लघु स्थलों के लिए उचित "
 "है।"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 "myorigin पैरामीटर उस डोमेन को बताता है जिससे स्थानीय-प्रेषित विपत्रआते हुए प्रतीत होते है"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "माईऑरिजिन् (myorigin):"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "बाह्य विपत्र सर्वर की संरचना की जा रही है"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1583,33 +1592,33 @@ msgstr ""
 "आपकी बाह्य विपत्र सेवा को संरचित करने में आवश्यक निम्नलिखित मानकों को यह जादूगरी ने एकत्र "
 "कर लिया है:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "पते का प्रकार"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "माईऑरिजिन् (myorigin)"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "यह जादूगरी अब एक आंतरिक विपत्र सेवा को संरचित करगी ।"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "विजार्ड ने आपके बाह्य विपत्र सर्वर को सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "पोस्टफ़िक्स सर्वर"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "विरोधाबास से बचने के लिए, जाँच करें कि सेन्डमेल संसाधित है..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "आपके पोस्टफ़िक्स सर्वर को संरचित किया जा रहा है...."
 
@@ -1834,7 +1843,7 @@ msgid "Set PXE server"
 msgstr "पीएक्सई सर्वर को स्थापित करें"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1846,7 +1855,7 @@ msgid "Modify boot image in PXE"
 msgstr "पीएक्सई में एक बूट प्रतिबिंब को परिवर्तित करना"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/hu.po b/po/hu.po
index da7a0472..98b3f079 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-09-15 00:50+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -27,8 +27,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Be�ll�t�svar�zsl�"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -38,8 +37,7 @@ msgid "Warning."
 msgstr "Figyelmeztet�s"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -49,10 +47,10 @@ msgstr "Hiba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -145,9 +143,9 @@ msgstr ""
 "kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Hiba."
@@ -311,7 +309,7 @@ msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DHCP-szolg�ltat�sait."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -484,7 +482,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Hiba."
@@ -645,15 +643,20 @@ msgstr "Levelez�kiszolg�l� neve:"
 msgid "PXE server"
 msgstr "NFS-kiszolg�l�"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Adatb�ziskiszolg�l�"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard var�zsl�v�laszt�s"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "V�lasszon egy var�zsl�t"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -662,7 +665,7 @@ msgstr ""
 "A(z) %s nincs telep�tve.\n"
 "Telep�t�s a \"K�vetkez�\" gombbal; kil�p�s a \"M�gsem\" gombbal."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "A telep�t�s nem siker�lt."
@@ -825,7 +828,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az intranetes/internetes FTP-kiszolg�l�t."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -923,6 +926,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Webkiszolg�l�-be�ll�t�si var�zsl�"
@@ -931,17 +941,21 @@ msgstr "Webkiszolg�l�-be�ll�t�si var�zsl�"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Jelsz�:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Jelsz�:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -953,26 +967,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "G�pn�v"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Adatb�ziskiszolg�l�"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1232,7 +1241,7 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az internetes h�rszolg�ltat�s be�ll�t�s�hoz "
 "sz�ks�ges param�tereket gy�jt�tte �ssze:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1541,24 +1550,24 @@ msgstr ""
 "Kiv�laszthatja, milyen fajta c�m jelenjen meg a kimen� levelek \"Felad�"
 "\" (\"From\") �s \"V�laszc�m\" (\"Reply-to\") mez�iben."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
 # a kimen� emailekhez haszn�land� domainnevet kell megadni az ut�na lev� mez�ben
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Tartom�nyn�v a maszkol�shoz:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Figyelmeztet�s:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "�res c�met adott meg a levelez��tj�r�nak."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1567,13 +1576,13 @@ msgstr ""
 "val� lev�lk�ld�sre. A folytat�shoz nyomja le a \"K�vetkez�\" gombot; egy "
 "�rt�k megad�s�hoz az \"El�z�\" gombot."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1584,12 +1593,12 @@ msgstr ""
 "\", akkor az internetes levelez�kiszolg�l�� �ltal�ban \"smtp.szolg�ltat�.com"
 "\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internetes levelez��tj�r�"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1597,31 +1606,31 @@ msgstr ""
 "A kiszolg�l� a kimen� leveleket egy levelez�si �tj�r� (mail gateway) fel� "
 "fogja elk�ldeni, amely a v�gs� k�zbes�t�sr�l gondoskodni fog."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Levelez�kiszolg�l� neve:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Az internetes levelez�s be�ll�t�sa"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1630,38 +1639,38 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az internetes levelez�szolg�ltat�s be�ll�t�s�hoz "
 "sz�ks�ges param�tereket gy�jt�tte �ssze:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "A c�m form�tuma"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az �n kiszolg�l�j�n az internetes "
 "levelez�szolg�ltat�st."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "A var�zsl� sikeresen be�ll�totta a proxy-kiszolg�l�t."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
@@ -1896,7 +1905,7 @@ msgid "Set PXE server"
 msgstr "NFS-kiszolg�l�"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1908,7 +1917,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/id.po b/po/id.po
index 79e7d17e..fe5f55a5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-03-13 17:14+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Nusantara - Bahasa Indonesia <id@li.org>\n"
@@ -19,8 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Dukun Konfigurasi"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Peringatan"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Error Wizard."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -131,9 +129,9 @@ msgstr ""
 "Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi Anda."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Error Wizard."
@@ -289,7 +287,7 @@ msgstr "Layanan DHCP server sukses dikonfigurasikan."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -461,7 +459,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Error Wizard."
@@ -622,15 +620,20 @@ msgstr "Nama Server Mail:"
 msgid "PXE server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server Database"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Pilihan alat drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Silakan pilih alat"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -639,7 +642,7 @@ msgstr ""
 "%s tak diinstal\n"
 "Klik \"Maju\" utk menginstal atau \"Batal\" utk keluar"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -795,7 +798,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Server FTP Intranet/Internet sukses dikonfigurasikan"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -893,6 +896,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Konfigurator Server Web"
@@ -901,17 +911,21 @@ msgstr "Konfigurator Server Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Katasandi:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
@@ -921,26 +935,21 @@ msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
 msgid "Hostname:"
 msgstr "Nama Host"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurasi Server FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server Database"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1195,7 +1204,7 @@ msgid ""
 "Internet News service:"
 msgstr "Parameter konfigurasi Layanan Berita Internet telah terkumpul:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1495,24 +1504,24 @@ msgstr ""
 "Anda dapat memilih jenis alamat yg tampak di kolom \"From:\" dan \"Reply-to"
 "\" mail keluar."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Nama domain terhitung"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Peringatan:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Anda memasukkan alamat kosong utk gateway mail."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1520,13 +1529,13 @@ msgstr ""
 "Pilihan Anda dapat diterima, tapi Anda takkan dapat mengirim mail ke luar "
 "jaringan lokal. Tekan Maju utk melanjutkan, atau Kembali utk mengisi nilai."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1536,12 +1545,12 @@ msgstr ""
 "jika provider Anda \"provider.com\", server mail internet biasanya \"smtp."
 "provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Gateway Mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1549,67 +1558,67 @@ msgstr ""
 "Server Anda akan mengirim mail keluar via gateway mail, yg bertanggung jawab "
 "atas pengiriman akhir."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Nama Server Mail:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Konfigurasi Mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "Parameter konfigurasi Layanan Mail Internet telah terkumpul:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Format Alamat"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Server proksi Anda sukses dikonfigurasikan."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server Cetak:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurasi Server FTP"
@@ -1838,7 +1847,7 @@ msgid "Set PXE server"
 msgstr "Server NFS"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1850,7 +1859,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/is.po b/po/is.po
index ef6df0d9..c013db17 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-is\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-09-13 21:31GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -22,8 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Stillingarálfur"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,8 +32,7 @@ msgid "Warning."
 msgstr "Aðvörun"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -44,10 +42,10 @@ msgstr "Villa."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -122,9 +120,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Villa."
@@ -271,7 +269,7 @@ msgstr "Vefmiðlari"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -431,7 +429,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Villa."
@@ -587,22 +585,27 @@ msgstr "Vefmiðlari"
 msgid "PXE server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Gagnagrunnsmiðlari"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -748,7 +751,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -845,6 +848,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
@@ -852,17 +862,21 @@ msgstr ""
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Lykilorð:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Vefmiðlari"
@@ -872,26 +886,21 @@ msgstr "Vefmiðlari"
 msgid "Hostname:"
 msgstr "Vélarheiti:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Vefmiðlari"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Gagnagrunnsmiðlari"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr ""
@@ -1131,7 +1140,7 @@ msgid ""
 "Internet News service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1412,111 +1421,111 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Aðvörun:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Vefmiðlari"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Vefmiðlari"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Notandanafn:"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Vefmiðlari"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Vefmiðlari"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Vefmiðlari"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr ""
 
@@ -1714,7 +1723,7 @@ msgid "Set PXE server"
 msgstr "Vefmiðlari"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1726,7 +1735,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/it.po b/po/it.po
index 60f8e51b..474dee50 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-11-25 18:51+0000\n"
 "Last-Translator: Marco De Vitis <mdv@spin.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -24,8 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistente di configurazione"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,8 +33,7 @@ msgid "Warning."
 msgstr "Attenzione."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -45,10 +43,10 @@ msgstr "Errore."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -140,9 +138,9 @@ msgstr ""
 "configurazione."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Errore"
 
@@ -304,7 +302,7 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -477,7 +475,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Errore"
@@ -632,15 +630,20 @@ msgstr "Server di posta"
 msgid "PXE server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Selezione assistente di Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Scegli un assistente"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -649,7 +652,7 @@ msgstr ""
 "%s non � installato.\n"
 "Premi \"Avanti\" per installarlo o \"Annulla\" per uscire."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "installazione non riuscita"
@@ -811,7 +814,7 @@ msgstr ""
 "L'assistente ha completato con successo la configurazione del server FTP per "
 "Internet e Intranet."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -909,6 +912,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Assistente di configurazione del server web"
@@ -917,17 +927,21 @@ msgstr "Assistente di configurazione del server web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -939,26 +953,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Nome del server (host name)"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurazione del server FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1217,7 +1226,7 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di news."
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1529,23 +1538,23 @@ msgstr ""
 "Puoi specificare il tipo di indirizzo che sar� visualizzato nei campi \"From:"
 "\" e \"Reply-To:\" della posta in uscita."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nome dominio in uscita (masquerade):"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Hai lasciato vuoto l'indirizzo del gateway di posta."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1554,13 +1563,13 @@ msgstr ""
 "spedire posta al di fuori della rete locale. Usa \"Avanti\" per proseguire, "
 "o \"Indietro\" per immettere un nome."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1570,12 +1579,12 @@ msgstr ""
 "tipodominio\"; per esempio, se il tuo provider � \"provider.it\", di solito "
 "il server di posta elettronica � \"smtp.provider.it\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Gateway di posta per Internet:"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1583,31 +1592,31 @@ msgstr ""
 "Il tuo server invier� la posta in uscita attraverso un gateway di posta, che "
 "si occuper� di recapitarla a destinazione."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Nome del server di posta:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Configurazione della posta elettronica"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1616,39 +1625,39 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di posta elettronica."
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forma dell'indirizzo:"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del servizio di "
 "posta elettronica per Internet sul server."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server proxy."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server di stampa:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Configurazione del server FTP"
@@ -1883,7 +1892,7 @@ msgid "Set PXE server"
 msgstr "Server FTP"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1895,7 +1904,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ja.po b/po/ja.po
index 5c6bf808..95fd33f4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-24 00:31-0500\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "設定ウィザード"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "警告"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -41,10 +39,10 @@ msgstr "エラー"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgstr ""
 "かもしれません。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "エラー"
 
@@ -278,7 +276,7 @@ msgstr "サーバのDHCPサービスの設定が終わりました。"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -442,7 +440,7 @@ msgid ""
 "continue"
 msgstr "ホストが既にDNS設定にあるようです..'次へ'を押すと続けます"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "エラー:"
 
@@ -585,15 +583,20 @@ msgstr "Mandrakeサーバインストール"
 msgid "PXE server"
 msgstr "PXEサーバ"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Sambaサーバ"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizardのウィザード選択"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "ウィザードを選んでください"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -602,7 +605,7 @@ msgstr ""
 "%s はインストールしていません。\n"
 "\"進む\" でインストールします。 \"キャンセル\" で終了"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "インストール失敗"
 
@@ -755,7 +758,7 @@ msgstr "FXPを許可"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "イントラネット/インターネットFTPサーバの設定が終わりました。"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizardを再起動して設定を変更してみてください"
@@ -859,6 +862,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "ウェブサーバの設定ウィザード"
@@ -867,17 +877,21 @@ msgstr "ウェブサーバの設定ウィザード"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "パスワード:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "このパラメータでブートオプションを変更します:"
@@ -887,27 +901,22 @@ msgstr "このパラメータでブートオプションを変更します:"
 msgid "Hostname:"
 msgstr "サーバのホスト名:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NISドメイン:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "システムのPXEサーバを設定.."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Sambaサーバ"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "サーバ - LDAPサーバを設定"
@@ -1159,7 +1168,7 @@ msgid ""
 "Internet News service:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1455,23 +1464,23 @@ msgstr ""
 "送信メールが\"From:\"と\"Reply-to\"欄に表示するアドレスを\n"
 "選ぶことができます。"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Masqueradeは有効なドメイン名にしてください(例: mydomain.com)"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "マスカレードドメイン名:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "メールゲートウェイに空のアドレスを入力しています。"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1480,14 +1489,14 @@ msgstr ""
 "ことはできません。'次へ'をクリックすると続けます。修正する\n"
 "場合は'戻る'をクリック"
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 "エラー。sendmailが入っています。Postfixをインストールする前に削除してください"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1498,78 +1507,78 @@ msgstr ""
 "のときは、インターネットメールサーバは多くの場合\n"
 "\"smtp.provider.com\"のようになります。"
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "インターネットメールゲートウェイ"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "サーバはメールゲートウェイを通して送信を行います。"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "メールサーバ名:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "デフォルトは'myhostnameを付加'。小さいサイトに適しています"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "ウェブサーバを設定"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "アドレスの形式"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "内部メールサーバを設定します。"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "外部メールサーバを設定しました。"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfixサーバ"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "競合を避けるためsendmailが入っているか確認.."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Postfixサーバを設定.."
 
@@ -1783,7 +1792,7 @@ msgid "Set PXE server"
 msgstr "PXEサーバを設定"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1795,7 +1804,7 @@ msgid "Modify boot image in PXE"
 msgstr "PXEのブートイメージを変更"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ko.po b/po/ko.po
index c9b475ca..56fab0e1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2002-09-09 08:06+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hanafos.com>\n"
@@ -24,8 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "���� ������"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -35,8 +34,7 @@ msgid "Warning."
 msgstr "���"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "������ ����."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -138,9 +136,9 @@ msgstr ""
 "��."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "������ ����."
@@ -296,7 +294,7 @@ msgstr "�����簡 ���������� DHCP ������ �����Ͽ����ϴ�."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -467,7 +465,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "������ ����."
@@ -628,15 +626,20 @@ msgstr "���� ���� �̸�:"
 msgid "PXE server"
 msgstr "NFS ����"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "�����ͺ��̽� ����"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "�巹��ũ������ ������ ����"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "�����縦 �����ϼ���."
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -645,7 +648,7 @@ msgstr ""
 "[%s]�� ��ġ�Ǿ� ���� �ʽ��ϴ�.\n"
 "���� ��ġ�Ϸ���, [����]��, �׳� �����Ϸ���, [���]�� ��������."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -801,7 +804,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "�����簡 ���������� ��Ʈ���/���ͳ� FTP ������ �����Ͽ����ϴ�."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -899,6 +902,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "�� ���� ���� ������"
@@ -907,17 +917,21 @@ msgstr "�� ���� ���� ������"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "��ȣ:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "��ȣ:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "�����簡 ���������� ���ͳ� ���� ������ �����Ͽ����ϴ�."
@@ -927,26 +941,21 @@ msgstr "�����簡 ���������� ���ͳ� ���� ������ �����Ͽ����ϴ�."
 msgid "Hostname:"
 msgstr "ȣ��Ʈ �̸�"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP ���� ���� ��"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "�����ͺ��̽� ����"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1200,7 +1209,7 @@ msgid ""
 "Internet News service:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1501,36 +1510,36 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "���� ������ �̸�"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "���:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "���� ����Ʈ���� �ּҸ� �Է����� �ʾҽ��ϴ�."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1540,12 +1549,12 @@ msgstr ""
 "�� �����ڰ� \"korea.com\"�̶��, ���ͳ� ���� ������ �Ϲ������� \"smtp.korea."
 "com\"���� �մϴ�."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "���ͳ� ���� ����Ʈ����"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1553,67 +1562,67 @@ msgstr ""
 "�� ������ ������ ������ ���� ����Ʈ���̸� ���� ������, ���� ����Ʈ���̰� ��"
 "�� ����� ����� ���Դϴ�."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "���� ���� �̸�:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "���ͳ� ���� ���� ��"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "�ּ� ����"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "�����簡 ���������� ���ͳ� ���� ������ �����Ͽ����ϴ�."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "�����簡 ���������� ������ ������ �����Ͽ����ϴ�."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "����Ʈ ����:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "FTP ���� ���� ��"
@@ -1838,7 +1847,7 @@ msgid "Set PXE server"
 msgstr "NFS ����"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1850,7 +1859,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/lv.po b/po/lv.po
index 642aab90..c63b303e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2002-09-18 22:09+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -19,8 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigur�cijas meistars"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Br�din�jums"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Meistara k��da."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgstr ""
 "Br�din�jums\\nJ�s lietojat DHCP, serveris var nestr�d�t ar �o konfigur�ciju.."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Meistara k��da."
@@ -294,7 +292,7 @@ msgstr "Meistars veiksm�gi nokonfigur�ja DHCP servisu priek� J�su servera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -456,7 +454,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Meistara k��da."
@@ -615,15 +613,20 @@ msgstr "Pasta servera nosaukums:"
 msgid "PXE server"
 msgstr "NFS serveris"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Datub�zu serveris"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard meistara izv�le"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "L�dzu, izv�lieties meistaru"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -632,7 +635,7 @@ msgstr ""
 "%s nav instal�ts\n"
 "Klik��iniet \"N�kamis\", lai instal�tu, vai \"Atlikt\" lai beigtu"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -786,7 +789,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Meistars veiksm�gi nokonfigur�ja Intraneta/Interneta FTP serveri"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -884,6 +887,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web servera konfigur��anas meistars"
@@ -892,17 +902,21 @@ msgstr "Web servera konfigur��anas meistars"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Meistars veiksm�gi nokonfigur�ja J�su servera Interneta pasta servisu"
@@ -912,26 +926,21 @@ msgstr "Meistars veiksm�gi nokonfigur�ja J�su servera Interneta pasta servisu"
 msgid "Hostname:"
 msgstr "Servera nosaukums:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Tiek konfigur�ts FTP serveris"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Datub�zu serveris"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1179,7 +1188,7 @@ msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1475,77 +1484,77 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Br�din�jums:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "J�s ievad�j�t tuk�u pasta v�rtejas adresi."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Interneta pasta v�rteja"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Pasta servera nosaukums:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Tiek konfigur�ts Interneta pasts"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1554,36 +1563,36 @@ msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Adreses forma"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Meistars veiksm�gi nokonfigur�ja J�su servera Interneta pasta servisu"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Meistars veiksm�gi nokonfigur�ja proxy serveri."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "FTP serveris"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Tiek konfigur�ts FTP serveris"
@@ -1806,7 +1815,7 @@ msgid "Set PXE server"
 msgstr "NFS serveris"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1818,7 +1827,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/mk.po b/po/mk.po
index 5864082f..164e33e2 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2002-12-07 12:44+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Конфигурациска самовила"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Внимание"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Самовилска грешка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -139,9 +137,9 @@ msgstr ""
 "конфигурација."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Самовилска грешка."
@@ -305,7 +303,7 @@ msgstr "Самовилата успешно ги конфигурираше DHCP
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -477,7 +475,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Самовилска грешка."
@@ -639,22 +637,27 @@ msgstr "Име на мејл сервер:"
 msgid "PXE server"
 msgstr "NFS сервер"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Database сервер"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard избор на самовила"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Изберете самовила"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -815,7 +818,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Самовилата успешно го конфигуирање Вашиот интранет/Интернет FTP сервер"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -913,6 +916,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Веб сервер конфигурациска самовила"
@@ -921,17 +931,21 @@ msgstr "Веб сервер конфигурациска самовила"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -942,26 +956,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Име на хост"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Конфигурирање на FTP серверот"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Database сервер"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1219,7 +1228,7 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "News сервис:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1527,24 +1536,24 @@ msgstr ""
 "Можете да го изберете видот на адреса што ќе биде прикажана во заминувачката "
 "пошта, во \"From:\" и \"Reply-to\" полињата."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Пресметано име на домен"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Предупредување:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Внесовте празна вредност за адреса на мејл gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1553,13 +1562,13 @@ msgstr ""
 "надвор од локалната мрежа. Притиснете „следно“ за да продолжите, или "
 "„претходно“ за да внесете вредност."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1569,12 +1578,12 @@ msgstr ""
 "пример, ако Вашиот провајдер е \"provider.com\", интернет мејл серверот "
 "обично е \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Интернет мејл gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1582,31 +1591,31 @@ msgstr ""
 "Вашиот сервер ќе ја испраќа поштата преку gateway, кој ќе се погрижи за "
 "конечната достава."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Име на мејл сервер:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Конфигурирање на Интернет пошта"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1615,37 +1624,37 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "Интернет мејл сервис:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Облик на адресата"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Самовилата успешно ги конфигурираше Интернет мејл сервисите на Вашиот сервер."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Самовилата успешно го конфигурираше Вашиот proxy сервер."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Принтер сервер:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Конфигурирање на FTP серверот"
@@ -1881,7 +1890,7 @@ msgid "Set PXE server"
 msgstr "NFS сервер"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1893,7 +1902,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ms.po b/po/ms.po
index 4390f6c9..60a09566 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-24 20:45+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Status konfigurasi bagi %s %s\n"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Amaran"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -41,10 +39,10 @@ msgstr "Ralat."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -131,9 +129,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Amaran dalam."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ralat"
 
@@ -296,7 +294,7 @@ msgstr "DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -465,7 +463,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Ralat"
@@ -626,22 +624,27 @@ msgstr "(%ld)PELAYAN >>> %s"
 msgid "PXE server"
 msgstr "Terima Notis Pelayan"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Pelayan Web"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "[%s (%s): gagal.  Diabaikan]\n"
@@ -810,7 +813,7 @@ msgstr "Izinkan Pembesaran"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Internet FTP"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -907,6 +910,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Pelayan Konfigurasikan"
@@ -915,17 +925,21 @@ msgstr "Pelayan Konfigurasikan"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Katalaluan:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Internet Mel."
@@ -935,26 +949,21 @@ msgstr "Internet Mel."
 msgid "Hostname:"
 msgstr "Namahos tidak sah"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Pelayan Web"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1217,7 +1226,7 @@ msgid ""
 "Internet News service:"
 msgstr "Internet Berita:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1527,38 +1536,38 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr "keluaran dalam dan."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Nama warna latarbelakang"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Amaram:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 #, fuzzy
 msgid "You entered an empty address for the mail gateway."
 msgstr "kosong."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 #, fuzzy
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr "lokal."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1566,79 +1575,79 @@ msgid ""
 "usually \"smtp.provider.com\"."
 msgstr "Internet dalam."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Mel"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "keluaran."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "%s: ralat pelayan nama tidak dapat dipulihkan berlaku."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Terima Notis Pelayan"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "Internet Mel:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Alamat IP"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Internet Mel."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Internet FTP"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "FTP"
@@ -1864,7 +1873,7 @@ msgid "Set PXE server"
 msgstr "Terima Notis Pelayan"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1876,7 +1885,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/mt.po b/po/mt.po
index a0388fa2..461f20cf 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-09-10 06:34+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -27,8 +27,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -38,8 +37,7 @@ msgid "Warning."
 msgstr "Twissija"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -49,10 +47,10 @@ msgstr "Problema."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -142,9 +140,9 @@ msgstr ""
 "konfigurazzjoni."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Problema."
@@ -307,7 +305,7 @@ msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -479,7 +477,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Problema."
@@ -639,15 +637,20 @@ msgstr "Isem is-server tal-imejl:"
 msgid "PXE server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server tad-database"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Għażla ta' saħħar DrakWizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Jekk jogħġbok agħżel saħħar"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -656,7 +659,7 @@ msgstr ""
 "%s m'hux installat\n"
 "Klikkja \"Li jmiss\" biex tinstalla jew \"Ikkanċella\" biex tieqaf"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "installazzjoni falliet"
@@ -816,7 +819,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Is-saħħar ikkonfiguralek is-server FTP għall-intranet/internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -914,6 +917,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Saħħar ta' konfigurazzjoni tal-web server"
@@ -922,17 +932,21 @@ msgstr "Saħħar ta' konfigurazzjoni tal-web server"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -944,26 +958,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Isem tal-kompjuter"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Qed jiġi kkonfigurat is-server FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server tad-database"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1221,7 +1230,7 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat is-servizz "
 "\"news\":"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1525,23 +1534,23 @@ msgstr ""
 "Tista' tagħżel it-tip ta' indirizz li jidher fil-messaġġi ħerġin taħt "
 "\"Mingħand\" u \"Risposti lil\""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquerade tal-isem tad-dominju:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Twissija:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Daħħalt indirizzi vojt għall-gateway tal-imejl."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1550,13 +1559,13 @@ msgstr ""
 "min-network lokali tiegħek. Agħfas \"Li jmiss\" biex tkompli, jew lura biex "
 "iddaħħal valur."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1566,12 +1575,12 @@ msgstr ""
 "dominju.tld\"; per eżempju jekk l-ISP huwa \"ditta.net.mt\", is-server tal-"
 "imejl jista' jkun \"mail.ditta.net.mt\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Gateway tal-imejl tal-internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1579,31 +1588,31 @@ msgstr ""
 "Is-server tiegħek jibgħat l-imejl li ħiereġ lil gateway tal-imejl, li jieħu "
 "jsib id-destinazzjoni finali."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Isem is-server tal-imejl:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Qed jiġi kkonfigurat l-imejl tal-internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1612,38 +1621,38 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura s-servizz tal-"
 "imejl tal-internet:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forma tal-indirizz"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Is-saħħar ikkonfiguralek is-servizz tal-imejl lill-internet tas-server "
 "tiegħek."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Is-saħħar ikkonfiguralek is-server proxy."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server tal-ipprintjar:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Qed jiġi kkonfigurat is-server FTP"
@@ -1877,7 +1886,7 @@ msgid "Set PXE server"
 msgstr "Server NFS"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1889,7 +1898,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/nb.po b/po/nb.po
index 1420b9f3..13784aa0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-10 20:31+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -28,8 +28,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "konfigurasjonsveiviser"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -38,8 +37,7 @@ msgid "Warning."
 msgstr "Advarsel."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -49,10 +47,10 @@ msgstr "Feil."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -138,9 +136,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du er i dhcp, tjeneren vil muligens ikke virke med din konfigurasjon."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Feil"
 
@@ -300,7 +298,7 @@ msgstr "Veiviseren konfigurerte vellykket DHCP-tjenestene."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -481,7 +479,7 @@ msgstr ""
 "Det ser ut som om verten allerede er i din DNS-konfigurasjon... trykk "
 "nestefor å fortsette"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Feil:"
 
@@ -627,15 +625,20 @@ msgstr "Mandrake Installasjonstjener"
 msgid "PXE server"
 msgstr "PXE-tjener"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba-tjener"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard veiviservalg"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Vennligst velg en veiviser"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -644,7 +647,7 @@ msgstr ""
 "%s er ikke installert\n"
 "Klikk \"Neste\" for å installere eller \"Avbryt\" for å avslutte"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Installasjon feilet"
 
@@ -804,7 +807,7 @@ msgstr "Tillat FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Veiviseren konfigurerte vellykket din Intranett/Internett FTP-tjener"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Vennligst start drakwizard på nytt, og prøv å endre noen parametre."
@@ -908,6 +911,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Velkommen til Kolab Gruppevare-tjenerkonfigurasjonsveiviser"
 
@@ -915,16 +925,20 @@ msgstr "Velkommen til Kolab Gruppevare-tjenerkonfigurasjonsveiviser"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Gjenta passord:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Veiviseren vil nå konfiguere Kolab-tjener med de følgende parametrene"
 
@@ -932,11 +946,11 @@ msgstr "Veiviseren vil nå konfiguere Kolab-tjener med de følgende parametrene"
 msgid "Hostname:"
 msgstr "Vertsnavn"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Epostdomene:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -945,16 +959,11 @@ msgstr ""
 "Kolab-tjeneren er nå konfigurert og kjører. Logg inn som 'manager' med "
 "passordet du tastet inn."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer PXE-tjener på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba-tjener"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Tjener - Sett opp konfigurasjon av LDAP-tjener"
@@ -1207,7 +1216,7 @@ msgstr ""
 "Veiviseren samlet følgende parametere\n"
 "som trengs for å konfigurere Internett nyhets-tjeneren din:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1511,23 +1520,23 @@ msgstr ""
 "Du kan velge adressene som utgående epost vil vise i \"From:\" og \"Reply-to"
 "\" feltene."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Masker burde være et gyldig navn som \"mittdomene.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masker domenenavn:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du entret en tom adresse for epost gatewayen."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1536,7 +1545,7 @@ msgstr ""
 "utenfor ditt lokale nettverk. Trykk neste for å fortsette, eller tilbake for "
 "å fylle inn en verdi."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1544,7 +1553,7 @@ msgstr ""
 "feil, sendmail er installert, fjern det vennligst før installering og "
 "konfigureringav Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1554,11 +1563,11 @@ msgstr ""
 "hvis din tilbyder er \"provider.com\", er internett epost tjeneren vanligvis "
 "\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internett epost-gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1566,16 +1575,16 @@ msgstr ""
 "Tjeneren din vil sende utgående via en epost gateway, denne vil ta hånd om "
 "sluttleveringen."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Navn på epost-tjener:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Standard er å tilføye myhostname hvilket er greit for små installasjoner."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1583,15 +1592,15 @@ msgstr ""
 "Parametren 'myorigin' angir domenet som den lokalt sendte epost ser ut til å "
 "komme fra"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Konfigurerer den eksterne epost-tjeneren"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1599,33 +1608,33 @@ msgstr ""
 "Veiviseren samlet følgende parametre som trengs for å konfigurere din "
 "Internett epost-tjener:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Adresseformat"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Veiviseren vil nå konfigurere en intern epost-tjener."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Veiviseren konfigurerte vellykket din eksterne epost-tjener."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix-tjener"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Tjek om sendmail er installert, for å unngå konflikt...."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurerer din Postfix-tjener....."
 
@@ -1850,7 +1859,7 @@ msgid "Set PXE server"
 msgstr "Sett PXE-tjener"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1862,7 +1871,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modifisér imagefil i PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/nl.po b/po/nl.po
index 8881a430..dd58a695 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-07 23:55+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -22,8 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Configuratiewizard"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,8 +31,7 @@ msgid "Warning."
 msgstr "Waarschuwing."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Fout opgetreden."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -136,9 +134,9 @@ msgstr ""
 "instellingen."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fout opgetreden"
 
@@ -299,7 +297,7 @@ msgstr "De wizard heeft de DHCP-dienst op uw server succesvol ingesteld."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -480,7 +478,7 @@ msgstr ""
 "Het lijkt erop dat deze computer al in uw DNS configuratie is opgenomen. "
 "Klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Fout opgetreden:"
 
@@ -625,15 +623,20 @@ msgstr "Mandrake installatie server"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard wizard selecteren"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Kies een wizard"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -642,7 +645,7 @@ msgstr ""
 "%s is niet geïnstalleerd\n"
 "Klik op \"Volgende\" om te installeren of \"Annuleren\" om af te sluiten"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Installatie is mislukt"
 
@@ -808,7 +811,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "De wizard heeft uw intranet/internet FTP server succesvol geconfigureerd"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard opnieuw en probeer het met andere gegevens."
@@ -914,6 +917,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Welkom bij de Kolab Groupware server-configuratiewizard"
 
@@ -921,16 +931,20 @@ msgstr "Welkom bij de Kolab Groupware server-configuratiewizard"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "De wizard zal de Kolab-server nu configureren met deze parameters"
 
@@ -938,11 +952,11 @@ msgstr "De wizard zal de Kolab-server nu configureren met deze parameters"
 msgid "Hostname:"
 msgstr "Computernaam:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "E-maildomein:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -951,16 +965,11 @@ msgstr ""
 "De Kolab-server is nu geconfigureerd en actief. Meldt u aan als 'manager' "
 "met het wachtwoord dat u heeft ingegeven."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "De PXE server op ow computer wordt geconfigureerd..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - LDAP serverconfiguratie instellen"
@@ -1211,7 +1220,7 @@ msgstr ""
 "De wizard heeft de volgende gegevens\n"
 "verzameld om uw internet nieuws service mee te configureren:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1520,24 +1529,24 @@ msgstr ""
 "U kunt kiezen welk adres de uitgaande mail zal aangeven in het \"From:\" en "
 "\"Reply-to\" veld."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Masquerade dient een geldige domeinnaam te zijn zoals \"mijndomein.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquerade-domeinnaam:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "U heeft een leeg adres opgegeven als mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1546,7 +1555,7 @@ msgstr ""
 "het lokale netwerk. Kies Volgende om verder te gaan, of Vorige om een waarde "
 "op te geven."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1554,7 +1563,7 @@ msgstr ""
 "Er is een fout opgetreden. Sendmail is geïnstaller, verwijder dit eerst "
 "voordat u Postfix installeert en configureert."
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1564,11 +1573,11 @@ msgstr ""
 "opgegeven; als uw provider bijvoorbeeld \"provider.nl\" is, dan is de "
 "internet mail server meestal \"smtp.provider.nl\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet e-mailgateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1576,16 +1585,16 @@ msgstr ""
 "Uw server zal de uitgaande mail versturen via een mail gateway die zorgt "
 "voor de bezorging."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "E-mailservernaam:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Als standaard wordt myhostname toegevoegd, wat bij kleine sites voldoet."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1593,15 +1602,15 @@ msgstr ""
 "De myorigin-parameter geeft het domein aan waar de lokale mail "
 "waarschijnlijk vandaan komt"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Externe e-mailserver configureren"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1609,33 +1618,33 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw externe e-mailserver te "
 "configureren:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Vorm van het adres"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "De wizard zal nu een interne e-mailserver configureren. "
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "De wizard heeft uw externe e-mailserver succesvol ingesteld."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix-server"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Controleer of sendmail is geïnstalleerd, om conflicten te vermijden..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "De Postfix server wordt geconfigureerd..."
 
@@ -1862,7 +1871,7 @@ msgid "Set PXE server"
 msgstr "PXE server opgeven"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1874,7 +1883,7 @@ msgid "Modify boot image in PXE"
 msgstr "Opstartbeeldbestand in PXE aanpassen"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/pl.po b/po/pl.po
index 3b55e6b5..2967bad7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-20 20:21+0100\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -22,8 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "druid konfiguracji"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,8 +31,7 @@ msgid "Warning."
 msgstr "Ostrzeżenie."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Błąd."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -129,9 +127,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Jesteś w dhcp, serwer może nie pracować z tą konfiguracją."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Błąd"
 
@@ -287,7 +285,7 @@ msgstr "Druid z powodzeniem skonfigurował usługi DHCP serwera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -469,7 +467,7 @@ msgstr ""
 "Wygląda na to, że komputer jest już w konfiguracji DNS... naciśnij dalej aby "
 "kontynuować"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Błąd:"
 
@@ -614,15 +612,20 @@ msgstr "Serwer instalacyjny Mandrake"
 msgid "PXE server"
 msgstr "Serwer PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Serwer samby"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard - wybór druida"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Wybierz druida"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -631,7 +634,7 @@ msgstr ""
 "Pakiet %s nie jest zainstalowany\n"
 "Kliknij \"Dalej\" aby go zainstalować lub \"Anuluj aby zakończyć"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
@@ -790,7 +793,7 @@ msgstr "Zezwalanie na FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Druid pomyślnie skonfigurował twój serwera FTP dla Intranetu/Internetu"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Uruchom ponownie drakwizarda i spróbuj zmienić niektóre parametry."
@@ -894,6 +897,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Witaj w druidzie konfiguracji serwera do pracy grupowej Kolab."
 
@@ -901,16 +911,20 @@ msgstr "Witaj w druidzie konfiguracji serwera do pracy grupowej Kolab."
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Hasło ponownie:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Druid zmodyfikuje teraz opcje serwera Kolab z tymi parametrami"
 
@@ -918,11 +932,11 @@ msgstr "Druid zmodyfikuje teraz opcje serwera Kolab z tymi parametrami"
 msgid "Hostname:"
 msgstr "Nazwa komputera:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Domena pocztowa:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -931,16 +945,11 @@ msgstr ""
 "Serwer kolab jest już skonfigurowany i pracuje. Zaloguj się jako \"manager\" "
 "z wprowadzonym hasłem."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurowanie serwera PXE w systemie ..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Serwer samby"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Serwer - Konfiguracja serwera LDAP"
@@ -1193,7 +1202,7 @@ msgstr ""
 "Druid zebrał poniższe parametry wymagane\n"
 "do skonfigurowania usługi internetowych grup dyskusyjnych:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1491,24 +1500,24 @@ msgstr ""
 "Można wybrać rodzaj adresu wyświetlanego do poczty przychodzącej w polu \"Od:"
 "\" i \"Odpowiedz do:\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Maskarada powinna być poprawną nazwą domeny jak np. \"mojadomena.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nazwa domeny maskarady:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Ostrzeżenie:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Wprowadzono pusty adres dla bramki pocztowej."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1517,7 +1526,7 @@ msgstr ""
 "zewnątrz sieci lokalnej. Naciśnij Dalej aby kontynuować, lub Wstecz aby "
 "wprowadzić wartość."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1525,7 +1534,7 @@ msgstr ""
 "Błąd, sendmail jest zainstalowany, usuń go przed instalacją i konfiguracją "
 "postfiksa"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1535,11 +1544,11 @@ msgstr ""
 "dla przykładu, jeśli twój dostawca to \"dostawca.com\", serwer poczty "
 "internetowej to zazwyczaj \"smtp.dostawca.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Bramka poczty internetowej"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1547,16 +1556,16 @@ msgstr ""
 "Twój serwer wyśle pocztę wychodzącą przez bramkę pocztową, która zadba o "
 "dostarczenie jej do odbiorcy."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Nazwa serwera poczty:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Domyślną czynnością jest dodawanie myhostname, co jest ok dla małych witryn."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1564,15 +1573,15 @@ msgstr ""
 "Parametr myorigin określa domenę, wstawianą dla lokalnie wysłanych "
 "wiadomości e-mail"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Konfigurowanie zewnętrznego serwera poczty"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1580,34 +1589,34 @@ msgstr ""
 "Druid zebrał poniższe parametry wymagane do skonfigurowania zewnętrznego "
 "serwera poczty:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Postać adresu"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Druid teraz skonfiguruje wewnętrzny serwer pocztowy."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Druid pomyślnie skonfigurował zewnętrzny serwer poczty."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Serwer Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 "Sprawdzanie czy sendmail jest zainstalowany w celu uniknięcia kolizji..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurowanie serwera Postfix..."
 
@@ -1836,7 +1845,7 @@ msgid "Set PXE server"
 msgstr "Ustaw serwer PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1848,7 +1857,7 @@ msgid "Modify boot image in PXE"
 msgstr "Zmodyfikuj obraz rozruchowy w PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/pt.po b/po/pt.po
index 992b306f..a8633281 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-12-02 07:16+0000\n"
 "Last-Translator: José Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -25,8 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistente de configuração"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -35,8 +34,7 @@ msgid "Warning."
 msgstr "Cuidado."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -46,10 +44,10 @@ msgstr "Erro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -137,9 +135,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Está em dhcp, o servidor pode não funcionar com a sua configuração."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro"
 
@@ -298,7 +296,7 @@ msgstr "O assistente conseguiu configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -470,7 +468,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Erro"
@@ -624,15 +622,20 @@ msgstr "Servidor de correio"
 msgid "PXE server"
 msgstr "Servidor Ftp"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Servidor Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Selecção do assistente Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Por favor escolha um assistente"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -641,7 +644,7 @@ msgstr ""
 "%s não está instalado\n"
 "Carregue em  \"Seguinte\"para o instalar ou em \"Anular\" para sair"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "a instalação falhou"
@@ -800,7 +803,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "O assistente conseguiu configurar o seu servidor FTP Intranet/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -898,6 +901,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Assistente de Configuração do Servidor Web"
@@ -906,17 +916,21 @@ msgstr "Assistente de Configuração do Servidor Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Senha :"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Senha :"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -928,26 +942,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Nome de Anfitrião"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "A configurar o Servidor FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Servidor Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1205,7 +1214,7 @@ msgstr ""
 "O assistente recuperou os parâmetros seguintes\n"
 "necessários para configurar o seu serviço de Internet News"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1513,23 +1522,23 @@ msgstr ""
 "Pode escolher o tipo de endereço que o correio expedido vai indicar nas "
 "zonas \"From:\" e \"Reply-to:\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nome de Dominio Masquerade :"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Atenção :"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Você deixou vazio o endereço da ponte do correio."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1538,13 +1547,13 @@ msgstr ""
 "fora da sua rede local. Carregue em Seguinte para continuar, ou Voltar para "
 "mudar um valor."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1554,12 +1563,12 @@ msgstr ""
 "tipodedominio\"; por exemplo, se o seu fornecedor é \"fornecedor.com\", o "
 "servidor de correio Internet é habitualmente \"smtp.fornecedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Ponte do Correio Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1567,31 +1576,31 @@ msgstr ""
 "O seu servidor vai enviar o correio através uma ponte de correio, que vai "
 "ocupar-se do resto do envio."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Nome do Servidor de Correio :"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "A configurar o Correio Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1600,38 +1609,38 @@ msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu serviço de Correio Internet :"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forma do Endereço"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "O assistente conseguiu configurar o serviço de Correio Internet do seu "
 "servidor."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "O assistente conseguiu configurar o seu servidor proxy."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Servidor de Impressão :"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "A configurar o Servidor FTP"
@@ -1864,7 +1873,7 @@ msgid "Set PXE server"
 msgstr "Servidor Ftp"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1876,7 +1885,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fd7db0ce..5e9eb70d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-02 23:46-0300\n"
 "Last-Translator: \n"
 "Language-Team:  <pt@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistente de configuração"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "Aviso"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "Erro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Você está em DHCP; o servidor pode não funcionar com sua configuração"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro."
 
@@ -299,7 +297,7 @@ msgstr "O assistente configurou com sucesso os serviços DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -480,7 +478,7 @@ msgstr ""
 "Parece que host já está na sua configuração de DNS... pressione próximo para "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Erro:"
 
@@ -625,15 +623,20 @@ msgstr "Instalação de Servidores Mandrake "
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Servidor Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Seleção de assistente Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Favor selecionar o assistente"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -642,7 +645,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em \"Próximo\" para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Falha na instalação"
 
@@ -805,7 +808,7 @@ msgstr ""
 "O assistente configurou com sucesso sua servidor de FTP para internet/"
 "intranet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Favor reinicie o drakwizard, e tente mudar alguns parâmetros."
@@ -910,6 +913,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Assistente de configuração do Servidor Web"
@@ -918,17 +928,21 @@ msgstr "Assistente de configuração do Servidor Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -939,27 +953,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Nome da máquina servidora:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Domínio NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor PXE no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Servidor Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Servidor - Definir configuração do servidor LDAP"
@@ -1212,7 +1221,7 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros necessários\n"
 "para configurar seu serviço de Notícias da Internet:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1518,24 +1527,24 @@ msgstr ""
 "Você pode selecionar o tipo de endereço que os e-mails enviados mostrarão "
 "nos campos \"From:\" and \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Mascarado deve ser um nome de domínio válido tal como \"mydomain.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nome de domínio Mascarado"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Você digitou um endereço vazio no gateway para correio"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1544,7 +1553,7 @@ msgstr ""
 "para fora da sua rede local. Pressione Continuar, ou volte para informar um "
 "valor."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1552,7 +1561,7 @@ msgstr ""
 "Erro, sendmail está instalado, favor removê-lo antes da instalação e "
 "configure Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1562,11 +1571,11 @@ msgstr ""
 "domínio\"; por exemplo, se ser o seu provedor é \"provedor.com\", o servidor "
 "de envio de correio será normalmente \"smtp.provedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Gateway para Correio Eletrônico"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1574,31 +1583,31 @@ msgstr ""
 "Seu servidor enviará mensagens por um gateway de correio que se encarregará "
 "da entrega final."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Nome do servidor de e-mail:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "O padrão é adicionar o nome do seu host, o que normalmente é adequado para "
 "sites pequenos"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "Minha Origem:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Configurando o servidor de e-mails externo"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1606,33 +1615,33 @@ msgstr ""
 "O assistente coletou os parâmetros necessários para configurar seu servidor "
 "de e-mails externo:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Estrutura do endereço"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "Minha Origem"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "O assistente vai configurar agora um servidor de e-mail interno."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "O assistente configurou com sucesso seu servidor de e-mails externo."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Servidor Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Verifica se o sendmail está instalado, para evitar conflito...."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Configurando seu servidor Postfix..."
 
@@ -1858,7 +1867,7 @@ msgid "Set PXE server"
 msgstr "Definir servidor PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1870,7 +1879,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modifica imagem de boot no PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ro.po b/po/ro.po
index 36a85e57..f6354547 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-12-16 17:15+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "asistent de configurare"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Avertisment."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Eroare."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Eroare"
 
@@ -295,7 +293,7 @@ msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -467,7 +465,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Eroare"
@@ -620,15 +618,20 @@ msgstr "Server de email"
 msgid "PXE server"
 msgstr "Server ftp"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Selecţie asistent Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Vă rog selectaţi un asistent"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -637,7 +640,7 @@ msgstr ""
 "%s nu este instalat\n"
 "Apăsaţi \"Înainte\" pentru a instala sau \"Renunţă\" pentru a ieşi"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
@@ -797,7 +800,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. FTP pentru Intranet/Internet."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -895,6 +898,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistent de configurare server Web"
@@ -903,16 +913,20 @@ msgstr "Asistent de configurare server Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -924,26 +938,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Antet server:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1199,7 +1208,7 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari\n"
 "pentru configurarea serviciului de ştiri din Internet:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1508,23 +1517,23 @@ msgstr ""
 "Puteţi selecta ce fel de adresă va fi afişată în câmpurile \"De la:\" şi "
 "\"Răspuns la\" pentru poşta de plecare."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Nume de domeniu 'mascaradat':"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Avertisment:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Nu aţi introdus adresa gateway-ului de mail."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1533,13 +1542,13 @@ msgstr ""
 "reţelei dvs. locale. Apăsaţi Următorul pentru a continua sau Înapoi pentru a "
 "introduce o valoare."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1549,12 +1558,12 @@ msgstr ""
 "\"; de exemplu, dacă furnizorul dvs. este \"provider.com\", adresa "
 "serverului său de mail este de obicei \"smtp.provicer.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Poartă mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1562,31 +1571,31 @@ msgstr ""
 "Serverul dvs. va trimite poşta printr-un gateway de mail, ce va avea grijă "
 "de transmiterea finală."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Nume server de mail:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Configurez poşta de Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1595,38 +1604,38 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serviciului de poştă de Internet:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forma adresei"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Asistentul a configurat cu succes serviciul de poştă în Internet a "
 "serverului dvs."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Asistentul a configurat cu succes serviciul Proxy al serverului dvs."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server de tipărire:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Configurez serverul FTP"
@@ -1859,7 +1868,7 @@ msgid "Set PXE server"
 msgstr "Server ftp"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1871,7 +1880,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ru.po b/po/ru.po
index b7c8f89b..787c10cc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-02 22:02+0200\n"
 "Last-Translator: Alice Lafox <alice@lafox.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "мастер настройки"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Предупреждение."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Ошибка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Вы используете dhcp, сервер может не работать с вашей конфигурацией."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ошибка"
 
@@ -288,7 +286,7 @@ msgstr "Мастер успешно настроил DHCP сервисы."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -468,7 +466,7 @@ msgstr ""
 "Похоже, что этот хост уже есть в конфигурации вашей DNS... Нажмите Далее для "
 "продолжения"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Ошибка:"
 
@@ -613,15 +611,20 @@ msgstr "Сервер установки Mandrake"
 msgid "PXE server"
 msgstr "Сервер PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Сервер Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Выбор мастера Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Пожалуйста, выберите мастер"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -630,7 +633,7 @@ msgstr ""
 "%s не установлен\n"
 "Нажмите \"Далее\" чтобы установить или \"Отмена\" чтобы выйти"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
@@ -790,7 +793,7 @@ msgstr "Разрешить FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Мастер успешно настроил ваш Интернет/Интранет сервер FTP"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустите drakwizard, и попробуйте изменить некоторые параметры."
@@ -896,6 +899,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Мастер настройки веб-сервера"
@@ -904,17 +914,21 @@ msgstr "Мастер настройки веб-сервера"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Сейчас мастер изменит параметры загрузки на следующие:"
@@ -924,27 +938,22 @@ msgstr "Сейчас мастер изменит параметры загруз
 msgid "Hostname:"
 msgstr "Имя хоста:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Домен NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Настраивается сервер PXE на вашей системе..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Сервер Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Сервер - Установка конфигурации сервера LDAP"
@@ -1194,7 +1203,7 @@ msgstr ""
 "Мастер собрал следующие параметры,\n"
 "необходимые для настройки вашей службы новостей Интернета:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1496,25 +1505,25 @@ msgstr ""
 "Вы можете выбрать тип адреса, который исходящая почта будет показывать в "
 "полях \"From:\" и \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Masquerade должен иметь действительное доменное имя, например \"mydomain.com"
 "\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Маскированное имя домена:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Предупреждение:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Вы ввели пустой адрес почтового шлюза."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1523,7 +1532,7 @@ msgstr ""
 "пределы вашей локальной сети. Нажмите Далее для продолжения или Назад, чтобы "
 "ввести значение."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1531,7 +1540,7 @@ msgstr ""
 "Ошибка, установлен sendmail, пожалуйста, удалите его перед установкой и "
 "настройкой Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1541,11 +1550,11 @@ msgstr ""
 "например, если ваш провайдер \"провайдер.com\", почтовым сервером Интернета "
 "обычно выступает \"smtp.провайдер.com\""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Почтовый шлюз Интернет"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1553,16 +1562,16 @@ msgstr ""
 "Ваш сервер будет отправлять исходящую почту через почтовый шлюз, который "
 "позаботится о конечной доставке."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Имя почтового сервера:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "По умолчанию добавляется myhostname, что приемлемо для маленьких сайтов."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1570,15 +1579,15 @@ msgstr ""
 "Параметр myorigin определяет домен, с которого приходит локально "
 "отправленная почта"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Настраивается внешний почтовый сервер"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1586,33 +1595,33 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего внешнего "
 "почтового сервера:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Форма адреса"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Мастер сейчас настроит внутренний почтовый сервер."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Мастер успешно настроил ваш внешний почтовый сервер."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Сервер Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Проверка, установлен ли sendmail, во избежание конфликта..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Настраивается ваш сервер Postfix..."
 
@@ -1840,7 +1849,7 @@ msgid "Set PXE server"
 msgstr "Настроить PXE сервер"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1852,7 +1861,7 @@ msgid "Modify boot image in PXE"
 msgstr "Изменить загрузочный образ в PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sk.po b/po/sk.po
index 603378e4..596e9e67 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-23 02:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -16,8 +16,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "sprievodca konfiguráciou"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -26,8 +25,7 @@ msgid "Warning."
 msgstr "Varovanie:"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -37,10 +35,10 @@ msgstr "Chyba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -123,9 +121,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Máte nastavené dhcp, server nemusí fungovať s touto konfiguráciou."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
 
@@ -281,7 +279,7 @@ msgstr "Sprievodca úspešne nakonfiguroval DHCP službu na vašom serveri."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -459,7 +457,7 @@ msgstr ""
 "Zdá sa, že tento názov už je vo vašej konfigurácii DNS... kliknite na "
 "Pokračovať pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Chyba:"
 
@@ -604,15 +602,20 @@ msgstr "Mandrake inštalačný server"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Výber Drakwizard sprievodcov"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Vyberte si sprievodcu"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -621,7 +624,7 @@ msgstr ""
 "%s nie je nainštalovaný\n"
 "Kliknite na \"Ďalej\" pre inštaláciu, alebo \"Zruš\" pre ukončenie"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
@@ -781,7 +784,7 @@ msgstr "Povoliť FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Intranet/Internet FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Spustite znova drakwizard a pokúste sa zmeniť niektoré nastavenia."
@@ -885,6 +888,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sprievodca konfiguráciou web servera"
@@ -893,17 +903,21 @@ msgstr "Sprievodca konfiguráciou web servera"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -914,27 +928,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Meno servera:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS doména:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurácia PXE servera na vašom systéme..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba server"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - nastaviť konfiguráciu LDAP servera"
@@ -1182,7 +1191,7 @@ msgstr ""
 "Sprievodca získal nasledovné parametre\n"
 "potrebné pre konfiguráciu vašej News služby:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1489,25 +1498,25 @@ msgstr ""
 "Môžete si nastaviť adresy, ktoré budú mať odchodzie emaily v hlavičkách "
 "\"From:\" a \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 "Maskovanie by malo byť za korektné doménové meno, ako napríklad \"domena.sk"
 "\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maškarádované doménové meno:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Upozornenie:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vložili ste prázdnu adresu poštovej brány."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1516,7 +1525,7 @@ msgstr ""
 "lokálnej siete. Stlačte Ďalej pre pokračovanie, alebo sa vráťte späť a "
 "zadajte potrebné hodnoty."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1524,7 +1533,7 @@ msgstr ""
 "Chyba, sendmail je nainštalovaný, odstráňte ho prosím predtým ako budete "
 "inštalovať Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1534,12 +1543,12 @@ msgstr ""
 "\"; napríklad ak váš provider je \"provider.sk\" internetový mail server "
 "bude zrejme \"smtp.provider.sk\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internetová poštová brána"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1547,16 +1556,16 @@ msgstr ""
 "Váš server pošle odchodziu poštu cez mail bránu, ktorá vykoná konečné "
 "doručenie."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Meno mail servera:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "Obyčajne sa iba pridá myhostname, čo je dostatočné pre malé siete."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1564,16 +1573,16 @@ msgstr ""
 "Myorigin parameter špecifikuje doménu, ktorá bude priradená pre lokálne "
 "odoslané maily."
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Konfigurácia web servera"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1582,37 +1591,37 @@ msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre konfiguráciu "
 "poštového systému:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Formát adresy"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Sprievodca teraz nastaví internetový poštový systém."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Sprievodca úspešne nakonfiguroval váš internetový poštový server."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix server"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 "Skontrolujte či je nainštalovaný sendmail, aby ste predišli konfliktom..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurácia vášho Postfix servera...."
 
@@ -1838,7 +1847,7 @@ msgid "Set PXE server"
 msgstr "Nastaviť PXE server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1850,7 +1859,7 @@ msgid "Modify boot image in PXE"
 msgstr "Modifikovať spúšťací obraz z PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sl.po b/po/sl.po
index 238a297d..64112b7c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-05 12:23+0100\n"
 "Last-Translator: Daniel Žalar <danizmax@email.si>\n"
 "Language-Team: Slovenian <prevajanje@mandrakeprinas.org>\n"
@@ -22,8 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Nastavitveni čarovnik"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,8 +31,7 @@ msgid "Warning."
 msgstr "Opozorilo."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Napaka."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -132,9 +130,9 @@ msgstr ""
 "Opozorilo\\nUporabljate dhcp, strežnik ne bo deloval z vašimi nastavitvami."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Napaka"
 
@@ -290,7 +288,7 @@ msgstr "Čarovnik je uspešno nastavil servise DHCP vašega strežnika."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -459,7 +457,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Napaka:"
 
@@ -611,15 +609,20 @@ msgstr ""
 msgid "PXE server"
 msgstr "Strežnik FTP"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba strežnik"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard izbira"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Prosimo izberite čarovnik"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -628,7 +631,7 @@ msgstr ""
 "%s ni nameščen\n"
 "Kliknite \"Naprej\" za namestitev ali \"Prekliči\" za izhod"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Instalacija ni uspela"
 
@@ -784,7 +787,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarovnik je uspešno nastavil intranetni/internetni strežnik FTP"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -886,6 +889,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarovnik za nastavitev spletnega strežnika"
@@ -894,17 +904,21 @@ msgstr "Čarovnik za nastavitev spletnega strežnika"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Geslo:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Čarovnik je uspešno nastavil poštne servise vašega strežnika."
@@ -914,26 +928,21 @@ msgstr "Čarovnik je uspešno nastavil poštne servise vašega strežnika."
 msgid "Hostname:"
 msgstr "Ime strežnika:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba strežnik"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1186,7 +1195,7 @@ msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vaših internetnih "
 "novičarskih servisov:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1487,23 +1496,23 @@ msgstr ""
 "Izberite vrsto naslova,v katerem se bo odhodna pošta prikazala v \\qOd:\\q "
 "in \\qOdgovori\\q polju."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Zamaskirano ime domene:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Opozorilo:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Naslov za protokolni konverter (gateway) je prazen."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1512,13 +1521,13 @@ msgstr ""
 "navzven vašega lokalnega omrežja. Kliknite Naprej za nadaljevanje ali Nazaj "
 "za vnos vrednosti."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1529,12 +1538,12 @@ msgstr ""
 "tipdomene\\q; Primer: če je vaš ponudnik \\qponudnik.com\\q, potem je "
 "internetni poštni strežnik navadno \\qsmtp.ponudnik.com\\q."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internetni poštni protokolni konverter (gateway)"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1542,31 +1551,31 @@ msgstr ""
 "Strežnik bo poslal izhodno pošto skozi internetni poštni protokolni "
 "konverter (gateway), ki bo poskrbel za dokončno dostavo."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Ime poštnega protokolnega konverterja (gateway):"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Nastavljam elektronsko pošto"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1575,35 +1584,35 @@ msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vašega internetnega "
 "poštnega protokolnega konverterja (gateway):"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Oblika naslova"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Čarovnik je uspešno nastavil poštne servise vašega strežnika."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Čarovnik je uspešno nastavil vaš PXE strežnik."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix Strežnik"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Nastavljam vaš Postfix strežnik....."
 
@@ -1834,7 +1843,7 @@ msgid "Set PXE server"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1846,7 +1855,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sq.po b/po/sq.po
index 0601861e..c53edd50 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drackwizard-sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2002-03-29 19:23+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Asistenti Konfigurues"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,8 +31,7 @@ msgid "Warning."
 msgstr "Kujdes"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Gabim."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -139,9 +137,9 @@ msgstr ""
 "funksionoj, me k�t� konfigurim."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Gabim."
@@ -307,7 +305,7 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -480,7 +478,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Gabim."
@@ -641,15 +639,20 @@ msgstr "Emri i Serverit Mail:"
 msgid "PXE server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server i Baz�s s� t� Dh�nave"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Zgjedhja e asistentit Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Ju lutemi zgjedheni nj� asistent"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -658,7 +661,7 @@ msgstr ""
 "%s nuk �sht� instaluar\n"
 "Kliko mbi \"Tjetri\" p�r ta instaluar apo mbi \"Anulo\" p�r ta braktisur"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "instalimi d�shtoi"
@@ -820,7 +823,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Aistenti e ka konfiguruar me sukses Serverin FTP Intranet/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -918,6 +921,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistenti Konfigurues p�r Server Web"
@@ -926,17 +936,21 @@ msgstr "Asistenti Konfigurues p�r Server Web"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -948,26 +962,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Emri Ftues"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server i Baz�s s� t� Dh�nave"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1226,7 +1235,7 @@ msgstr ""
 "Asistenti i ka p�rmbledhur me sukses parametrat vijues q� nevojiten p�r ta "
 "konfiguruar Servisin e Lajmeve tuaja:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1535,23 +1544,23 @@ msgstr ""
 "Ju mund ta zgjedhni form�n e adres�s t� mesazheve dal�se q� posedojn� zonat "
 "\"From:\" dhe \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Emri i pron�s llogarit�se:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Kujdes:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Ju e keni futur nj� adres� t� zbraz�t p�r kalimtarin."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1560,13 +1569,13 @@ msgstr ""
 "e nj� letre (mail) jasht� rrjetit tuaj lokal. Klikoni mbi Tjetri p�r t� "
 "vazhduar ose mbi Mbrapa p�r ta ndryshuar."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1576,12 +1585,12 @@ msgstr ""
 "domaintype\"; p�r shembull, n�se furnizuesi i juaj �sht� \"provider.com\", "
 "serveri i letreva elektronike (mail) �sht� ky \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1589,31 +1598,31 @@ msgstr ""
 "Serveri juaj do ti d�rgoj t� gjitha lajmet dal�se n� drejtim t� nj� zone "
 "kaluese, e cila do t� kujdeset p�r d�rgimin e tyre final."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Emri i Serverit Mail:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Konfigurimi i Mesazheve (Mail) n� Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1622,38 +1631,38 @@ msgstr ""
 "Asistenti i ka p�rmbledhur parametrat vijues q� i nevojiten n� konfigurimin "
 "e Sh�rbimit tuaj Internet p�r Letrat Elektronike (Mail):"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Forma e Adres�s"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Asistenti i ka konfiguruar me sukses sh�rbimet e lajm�ruesit Internet p�r "
 "rrjetin tuaj."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin proxy."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server Stampimi:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurimi i Serverit FTP"
@@ -1889,7 +1898,7 @@ msgid "Set PXE server"
 msgstr "Server NFS"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1901,7 +1910,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sr.po b/po/sr.po
index be2fd83a..23002c68 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Чаробњак за подешавање"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Упозорење"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Грешка у чаробњаку."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgstr ""
 "Упозорење\\nВи сте у dhcp, сервер може да не ради уз оваква подешавања."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Грешка у чаробњаку."
@@ -295,7 +293,7 @@ msgstr "Чаробњак је успешно подесио DHCP сервисе
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -467,7 +465,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Грешка у чаробњаку."
@@ -625,22 +623,27 @@ msgstr "Име сервера поште:"
 msgid "PXE server"
 msgstr "NFS сервер"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Сервер бази података"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-ов избор чаробњака"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Молимо Вас да изаберете чаробњака"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -798,7 +801,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Чаробњак је успешно подесио Ваш интернет/интранет FTP сервер"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -896,6 +899,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Чаробњак за подешавање Web сервера"
@@ -904,17 +914,21 @@ msgstr "Чаробњак за подешавање Web сервера"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -925,26 +939,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Име домаћина:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Сервер бази података"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1202,7 +1211,7 @@ msgstr ""
 "Чаробњак је сакупио следеће параметре који су потребни да би сте подесили "
 "Ваш интернет news сервис:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1506,24 +1515,24 @@ msgstr ""
 "Можете да изаберете шта ће се појављивати у следећим пољима излазних порука: "
 "\"From\" и \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Упозорење:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Унели сте празну адресу за mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1532,13 +1541,13 @@ msgstr ""
 "мреже. Притисните дугме даље да би сте наставили, или назад да би сте унели "
 "вредност."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1548,12 +1557,12 @@ msgstr ""
 "на пример, ако је ваш пружалац \"pruzalac.com\", адреса поштанског сервера "
 "је обично \"smtp.pruzalac.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Интернет Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1561,31 +1570,31 @@ msgstr ""
 "Ваш сервер ће слати излазну пошту кроз капију за пошту, која ће се бринути "
 "за коначну испоруку."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Име сервера поште:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Подешавање интернет поште"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1594,37 +1603,37 @@ msgstr ""
 "Овај чаробњак је сакупио следеће параметре потрбне за подешавање Вашег "
 "интернет поштанског сервиса:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Облик адресе"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Овај чаробњак је успешно подесио сервис интернет поште на Вашем серверу."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Чаробњак је успешно подесио ваш прокси сервер."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Сервер за штампање:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Подешавање FTP сервера"
@@ -1854,7 +1863,7 @@ msgid "Set PXE server"
 msgstr "NFS сервер"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1866,7 +1875,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 3f23d6de..75c9c6f5 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "Upozorenje"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "Greška u čarobnjaku."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgstr ""
 "Upozorenje\\nVi ste u dhcp, server može da ne radi uz ovakva podešavanja."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "Greška u čarobnjaku."
@@ -297,7 +295,7 @@ msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -469,7 +467,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Greška u čarobnjaku."
@@ -627,22 +625,27 @@ msgstr "Ime servera pošte:"
 msgid "PXE server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server bazi podataka"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-ov izbor čarobnjaka"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Molimo Vas da izaberete čarobnjaka"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -800,7 +803,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarobnjak je uspešno podesio Vaš internet/intranet FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -898,6 +901,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarobnjak za podešavanje Web servera"
@@ -906,17 +916,21 @@ msgstr "Čarobnjak za podešavanje Web servera"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -927,26 +941,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Ime domaćina:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server bazi podataka"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1204,7 +1213,7 @@ msgstr ""
 "Čarobnjak je sakupio sledeće parametre koji su potrebni da bi ste podesili "
 "Vaš internet news servis:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1508,24 +1517,24 @@ msgstr ""
 "Možete da izaberete šta će se pojavljivati u sledećim poljima izlaznih "
 "poruka: \"From\" i \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Upozorenje:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Uneli ste praznu adresu za mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1534,13 +1543,13 @@ msgstr ""
 "mreže. Pritisnite dugme dalje da bi ste nastavili, ili nazad da bi ste uneli "
 "vrednost."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1550,12 +1559,12 @@ msgstr ""
 "na primer, ako je vaš pružalac \"pruzalac.com\", adresa poštanskog servera "
 "je obično \"smtp.pruzalac.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1563,31 +1572,31 @@ msgstr ""
 "Vaš server će slati izlaznu poštu kroz kapiju za poštu, koja će se brinuti "
 "za konačnu isporuku."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Ime servera pošte:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Podešavanje internet pošte"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1596,37 +1605,37 @@ msgstr ""
 "Ovaj čarobnjak je sakupio sledeće parametre potrbne za podešavanje Vašeg "
 "internet poštanskog servisa:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Oblik adrese"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Ovaj čarobnjak je uspešno podesio servis internet pošte na Vašem serveru."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Čarobnjak je uspešno podesio vaš proksi server."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server za štampanje:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Podešavanje FTP servera"
@@ -1857,7 +1866,7 @@ msgid "Set PXE server"
 msgstr "NFS server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1869,7 +1878,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/sv.po b/po/sv.po
index 02d3b8c0..e9cd18c2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-01-23 21:20+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "konfigurationsguide"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "Varning."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "Fel."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du är i DHCP, servern kanske inte fungerar med din konfiguration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fel"
 
@@ -293,7 +291,7 @@ msgstr "Guiden lyckades med att konfigurera DHCP-tjänsterna på servern."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -458,7 +456,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Fel:"
 
@@ -607,15 +605,20 @@ msgstr "Namn på e-postserver:"
 msgid "PXE server"
 msgstr "PXE-server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba-server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Val av guide"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Välj en guide"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -624,7 +627,7 @@ msgstr ""
 "%s är inte installerad.\n"
 "Klicka på \"Nästa\" för att installera eller \"Avbryt\" för att avsluta."
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Installation misslyckades"
 
@@ -782,7 +785,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Guiden lyckades med att konfigurera FTP-servern för Intranät/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -880,6 +883,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Konfigurationsguide för webbserver"
@@ -888,17 +898,21 @@ msgstr "Konfigurationsguide för webbserver"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Lösenord:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -910,27 +924,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Servervärddatornamn:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS-domän:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerar FTP-servern"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba-server"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1186,7 +1195,7 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera "
 "diskussionsgruppstjänsten:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1489,23 +1498,23 @@ msgstr ""
 "Du kan välja vilken typ av adress som utgående post ska visa i fälten \"Från:"
 "\" och \"Svara till\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskera domännamn:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Varning:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du angav en tom adress för e-post-gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1514,13 +1523,13 @@ msgstr ""
 "lokala nätverk. Klicka på Nästa för att fortsätta eller Tillbaka för att "
 "ange ett värde."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1531,12 +1540,12 @@ msgstr ""
 "leverantör är \"leverantör.se\", är e-postservern för Internet vanligtvis "
 "\"smtp.leverantör.se\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Gateway för Internet-e-post"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1544,31 +1553,31 @@ msgstr ""
 "Din server skickar den utgående posten genom en e-post-gateway som tar hand "
 "om den slutgiltiga leveransen."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Namn på e-postserver:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Konfigurerar e-post för Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1577,38 +1586,38 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera e-"
 "posttjänsten för Internet"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Adressens form"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Guiden lyckades med att konfigurera tjänsterna för Internet-e-post på "
 "servern."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Guiden lyckades med att konfigurera proxyservern."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Skrivarserver:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Konfigurerar FTP-servern"
@@ -1836,7 +1845,7 @@ msgid "Set PXE server"
 msgstr "NFS-server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1848,7 +1857,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/ta.po b/po/ta.po
index 864bafb4..d8aca357 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2002-09-06 00:50+0800\n"
 "Last-Translator: prabu<prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "எச்சரிக்ைக"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -43,10 +41,10 @@ msgstr "மாயாவியில் பிழை நேர்ந்துள�
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgstr ""
 "எச்சரிக்ைக,\\n நீங்கள் dhcp சேவையகத்தில் உள்ளீர்கள், சேவையகம் வேலை செய்வதை நிறுத்தி விடலாம்"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
@@ -296,7 +294,7 @@ msgstr "இந்த மாயாவி உங்கள் DHCP சேவைக�
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -468,7 +466,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
@@ -627,15 +625,20 @@ msgstr "மின்னஞ்சல் சேவையகத்தின் ப�
 msgid "PXE server"
 msgstr "NFS சேவையகம்"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "தரவுத்தளச் சேவையகம்"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "டிரேக்மாயாவியின் மாயாவித்  தேர்வு"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "தயவுசெய்து ஒரு மாயாவியைத் தேர்வுச் செய்யவும்"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -645,7 +648,7 @@ msgstr ""
 "\"அடுத்து\" என்றால் நிறுவப்படும்,\n"
 "இல்ைலயெனில் \"தவிர்\" என்றால் நிறுவப்படாமல் வெளிச்ெசல்லும்"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr ""
 
@@ -802,7 +805,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "மாயாவி உங்கள் FTP இணையச் சேவையகத்ைத வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -900,6 +903,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "வலையத்தளச் சேவையக வடிவமைப்பு மாயாவி"
@@ -908,17 +918,21 @@ msgstr "வலையத்தளச் சேவையக வடிவமைப�
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -930,26 +944,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "தரவுத்தளச் சேவையகம்"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1205,7 +1214,7 @@ msgid ""
 "Internet News service:"
 msgstr "உங்கள் செய்தியஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களைசேகரித்துள்ளது"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1509,24 +1518,24 @@ msgstr ""
 "நீங்கள் உங்களிடமிருந்து செல்லும் மின்னஞ்சல்களின் \"From:\" - அஞுப்புனர் மற்றும் \"Reply-to"
 "\" பதிலளிக்க-வேண்டிய முகவரி ஆகிய மதிப்புகளை மாற்ற முடியும்"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "எச்சரிக்ைக:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "நீங்கள் மின்னஞ்சல் நுழைவாயில் கணினியின் பெயரை இன்னும் எழுதவில்ைல"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1535,13 +1544,13 @@ msgstr ""
 "எங்கும் மின்னஞ்சல் அனுப்ப முடியாது. தொடர அடுத்தது என்ற பொத்தானை தேர்வுச்ெசய், அல்லது "
 "மாற்றங்கள் செய்ய பின்னால்என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் செல்லவும்"
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1550,12 +1559,12 @@ msgstr ""
 "மின்னஞ்சல் சேவையகத்தின் பெயர் என்பது இணையத்திலிருந்து உங்கள் வலையமைப்பிற்கு மின்னஞ்சல்களை "
 "அளிக்கும் கணினியின் பெயர், இது பொதுவாக உங்கள் சேவையளிப்பவர் இதனை உங்களுக்கு தருவார்"
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "மின்னஞ்சல் நுழைவாயில் கணினியின் பெயர்"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1563,70 +1572,70 @@ msgstr ""
 "உங்கள் சேவையகம் மின்னஞ்சல்களை ஒரு நுழைவாயிலுக்கு அனுப்பினால், அந்த  நுழைவாயில் கணினி "
 "மின்னஞ்சல்களை சேர்ப்பதை பார்த்துக் கொள்ளும்"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "இணைய மின்னஞ்சல் வடிவமைக்கப்படுகிறது"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "உங்கள் மின்னஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "முகவரியின் அமைப்பு"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "இந்த மாயாவி மின்னஞ்சல் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக "
 "வடிவமைத்துவிட்டது"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr ""
 "இந்த மாயாவி பினாமிச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "அச்சு சேவையகம்:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
@@ -1850,7 +1859,7 @@ msgid "Set PXE server"
 msgstr "NFS சேவையகம்"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1862,7 +1871,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/tg.po b/po/tg.po
index c13e3d2e..4cda6f92 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2003-11-23 02:35+0500\n"
 "Last-Translator: Dilshod A. Marupov <kct_tj@yahoo.co.uk>\n"
 "Language-Team: Tajik <kct_tj@yahoo.co.uk>\n"
@@ -23,8 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "устоди ба танзимдарорӣ"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,8 +32,7 @@ msgid "Warning."
 msgstr "Огоҳӣ."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -44,10 +42,10 @@ msgstr "Хатогӣ."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -135,9 +133,9 @@ msgstr ""
 "Шумо дар dhcp мебошед, эҳтимол хидматрасон бо ин танзимдарорӣ кор намекунад."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хатогӣ"
 
@@ -294,7 +292,7 @@ msgstr "Манъаи DHCP серверо устод бомуввафақият �
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -466,7 +464,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 #, fuzzy
 msgid "Error:"
 msgstr "Хатогӣ"
@@ -620,15 +618,20 @@ msgstr "Хидматрасонро фиристодан"
 msgid "PXE server"
 msgstr "хидматрасони Ftp"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Хидматрасони Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Интихобҳои устоди Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Илтимос устодро интихоб кунед"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -638,7 +641,7 @@ msgstr ""
 "Пахш намоед \"Оянда\" барои насб намудан ё ин ки \"Бекор кардан\" барои "
 "хориҷшавӣ"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 #, fuzzy
 msgid "Installation failed"
 msgstr "коргузорӣ амалӣ нагардид"
@@ -802,7 +805,7 @@ msgstr ""
 "Манъаи Intranet/Интернети FTP серверо устод бомуввафақият ба танзим "
 "дароварда шуд"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -900,6 +903,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Устоди Танзимдарории WebХидматрасон"
@@ -908,17 +918,21 @@ msgstr "Устоди Танзимдарории WebХидматрасон"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "гузарвожа"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "гузарвожа"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -929,26 +943,21 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Номи Соҳиб"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ба танзим даровардани хидматрасони FTP"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Хидматрасони Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1205,7 +1214,7 @@ msgstr ""
 "Устод параметрҳои зеринро ҷамъ намуд, ки барои\n"
 "ба танзим даровардани Хадамоти Ахбороти Интернет лозим аст:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1508,23 +1517,23 @@ msgstr ""
 "Шумо метавонед намуди суроғаро дар пости рафтаистода дар майдони \"From:\" "
 "and \"Reply-to\" интихоб кунед."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Номи пинҳонии азозил:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Диққат"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "шумо адреси холиро ба хат чор кардед."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1533,13 +1542,13 @@ msgstr ""
 "намешавадберун аз шабакаи маҳали. Давомро зер кунед барои давом додан, ё "
 "пушро барои қиматиҳоро дохил кардан."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1549,42 +1558,42 @@ msgstr ""
 "масалан, агар таҳиягари Шумо \"provider.com\" бошад, одатан хидматрасони "
 "пости internet \"smtp.provider.com\" аст."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "пости интернети Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "шабака хати беруниро мефурсонад бо хати gateway, "
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "номи хидматрасони хат"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Танзими Internet Пост"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1593,37 +1602,37 @@ msgstr ""
 "Устод параметрҳои зерине ки ба танзими Хадамоти Internet Пости шумо зарур "
 "аст ҷамъ кард;"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Шакли Суроға"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Манъаи пости Интернет серверо устод бомуввафақият ба танзим дароварда шуд"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Устод бомуваффақатона хидматрасони proxy Шуморо ба танзим даровард."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Хидматрасони Чопӣ:"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Ба танзим даровардани хидматрасони FTP"
@@ -1855,7 +1864,7 @@ msgid "Set PXE server"
 msgstr "хидматрасони Ftp"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1867,7 +1876,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/tl.po b/po/tl.po
index 63143562..d02ee27c 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
-"PO-Revision-Date: 2004-03-10 15:40+0800\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
+"PO-Revision-Date: 2004-03-11 15:59+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@list.comitus.net>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "configuration wizard"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Babala."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -41,10 +39,10 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -133,9 +131,9 @@ msgstr ""
 "configuration mo."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
 
@@ -296,7 +294,7 @@ msgstr "Matagumpay na na-configure ng wizard ang mga DHCP service."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -479,7 +477,7 @@ msgstr ""
 "Tila itong host ay nasa DNS configuration mo na... pindutin ang 'Kasunod' "
 "para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Error:"
 
@@ -625,15 +623,19 @@ msgstr "Mandrake Install server"
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Pagpili ng wizard ng Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Pumili ng wizard"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -642,7 +644,7 @@ msgstr ""
 "%s ay hindi naka-install\n"
 "I-click ang \"Kasunod\" para i-install o ang \"I-cancel\" para hindi tumuloy"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Nabigo ang pag-i-install"
 
@@ -807,7 +809,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Matagumpay na na-configure ng wizard ang iyong intranet/Internet FTP server."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Ilunsad muli ang drakwizard, at subukang baguhin ang ilang parameter."
@@ -910,6 +912,17 @@ msgid ""
 "provision for mailbox users as well as contacts and a POP3 as well as IMAP4"
 "(rev1) access to mail"
 msgstr ""
+"Ang kolab ay isang secure, scalable at maaasahang groupware server. Ilan sa "
+"mga mabibigat na katangian ay: (1) pangangasiwa sa pamamagitan ng web "
+"interface; (2) nakapamahaging address book na may provision para sa mga "
+"mailbox user at mga contact; at (3) POP3 at IMAP4 (rev1) access sa mail"
+
+#: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
@@ -917,18 +930,22 @@ msgstr "Maligayang pagdating sa Kolab Groupware server configuration Wizard."
 
 #: ../kolab_wizard/Kolab.pm:72
 msgid "Enter pasword for the manager account of Kolab server."
+msgstr "Magpasok ng password para sa account ng manager ng Kolab server."
+
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Password ulit:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Ico-configure ngayon ng wizard ang Kolab server gamit itong mga parameter"
@@ -937,28 +954,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Mail domain:"
 
-#: ../kolab_wizard/Kolab.pm:99
-#, fuzzy
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
-"Ang Kolab server ay na-configure na at tumatakbo. Mag-login bilang 'manager' "
-"gamit ang password na ipinasok mo."
+"Ang Kolab server ay na-configure na at tumatakbo. Mag-login bilang "
+"'manager', gamit ang password na ipinasok mo, sa https://127.0.0.1/kolab/"
+"admin/"
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
+#: ../kolab_wizard/Kolab.pm:140
 msgid "Configuring Kolab server on your system..."
-msgstr "Kino-configure ang PXE server sa iyong sistema..."
-
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba server"
+msgstr "Kino-configure ang Kolab server sa iyong sistema..."
 
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
@@ -1213,7 +1224,7 @@ msgstr ""
 "Naipon ng wizard ang mga sumusunod na parameter na kailangan para ma-"
 "configure ang iyong Internet News service:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1521,23 +1532,23 @@ msgstr ""
 "Mapipili mo ang klase ng address na ipapakita ng pa-labas (\"outgoing\") na "
 "mail sa \"From:\" (Mula kay) at \"Reply-to\" (Sumagot kay) na field."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Ang masquerade ay dapat balidong domain name gaya ng \"domainko.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquerade domain name:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Babala:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Nagpasok ka ng walang lamang address para sa mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1546,7 +1557,7 @@ msgstr ""
 "labas ng local network mo. Pindutin ang 'Kasunod' para magpatuloy, o 'Balik' "
 "para magpasok ng halaga."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1554,7 +1565,7 @@ msgstr ""
 "Error, naka-install ang sendmail, pakitanggal ito bago i-install at i-"
 "configure ang Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1564,11 +1575,11 @@ msgstr ""
 "domain.uringdomain\"; halimbawa, kung ang provider mo ay \"provider.com\", "
 "ang Internet mail server ay karaniwang \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet mail gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1576,16 +1587,16 @@ msgstr ""
 "Ipapadala ng server mo ang pa-labas (outgoing) sa pamamagitan ng mail "
 "gateway, na siyang bahala sa pangwakas na pagpapadala"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Pangalan ng mail server:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Ang default ay idugtong ang myhostname, na mabuti para sa maliliit na site."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1593,15 +1604,15 @@ msgstr ""
 "Ang pinanggalinganko na parameter ay nagsasabi ng domain na mukhang "
 "pinanggalingan ng \"locally-posted\" (local na ipinaskil) na mail (sulat)."
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "pinanggalinganko:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Kino-configure ang panglabas na mail server"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1609,34 +1620,32 @@ msgstr ""
 "Naipon ng wizard ang mga sumusunod na parameter na kailangan para ma-"
 "configure ang iyong panglabas na mail server:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Anyo ng address"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "pinanggalinganko"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "Magco-configure ngayon ang wizard ng pangloob na mail server."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Matagumpay na na-configure ng wizard ang panglabas na mail server mo."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix Server"
 
-#: ../postfix_wizard/Postfix.pm:171
-#, fuzzy
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
-msgstr ""
-"Suriin kung naka-install ang sendmail, para iwasan ang pagkakasalungat...."
+msgstr "inaalis ang Sendmail, para iwasan ang pagkakasalungat...."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Kino-configure ang iyong Postfix server....."
 
@@ -1867,8 +1876,9 @@ msgid "Set PXE server"
 msgstr "I-set ang PXE server"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
-msgstr ""
+#, fuzzy
+msgid "Add boot image (Mandrake release < 9.2)"
+msgstr "Idagdag ang boot (Mandrake release < 9.2)"
 
 #: ../pxe_wizard/Pxe.pm:87
 msgid "Remove boot image in PXE"
@@ -1879,8 +1889,9 @@ msgid "Modify boot image in PXE"
 msgstr "Baguhin ang boot image sa PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
-msgstr ""
+#, fuzzy
+msgid "Add all.rdz image (Mandrake release > 10.0)"
+msgstr "Idagdag ang all.rdz (Mandrake release > 10.0)"
 
 #: ../pxe_wizard/Pxe.pm:111
 msgid "PXE wizard"
@@ -2132,9 +2143,8 @@ msgstr ""
 "kailangan ng mga network computer ang boot image."
 
 #: ../pxe_wizard/Pxe.pm:200
-#, fuzzy
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Kailangan natin ng image. Magdagdag ng isa."
+msgstr "Kailangan natin ng all.rdz o network.img na image. Magdagdag ng isa."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
diff --git a/po/tr.po b/po/tr.po
index efd4eba9..2dc5d913 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-01 11:43+0200\n"
 "Last-Translator: S. Alp ŞENYER <ssenyer@linux-sevenler.org>\n"
 "Language-Team: Turkish <Kde-i18n-tr@kde.org>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "yapılandırma sihirbazı"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "Uyarı."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "Hata."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -134,9 +132,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "dhcp kullanıyorsunuz, sunucu bu yapılandırmanızla çalışmayabilir."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Hata"
 
@@ -298,7 +296,7 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -480,7 +478,7 @@ msgstr ""
 "Makine ismi zaten DNS yapılandırmanızın içinde yer almakta... devam etmek "
 "için 'İleri'ye basın"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Hata:"
 
@@ -628,15 +626,20 @@ msgstr "Mandrake Kurulum sunucusu"
 msgid "PXE server"
 msgstr "PXE sunucusu"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba sunucusu"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard sihirbaz seçimi"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Lütfren bir sihirbaz seçin"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -646,7 +649,7 @@ msgstr ""
 "\"Sonraki\" tuşuna basarak kurulumu başlatabilirsiniz veya\n"
 "\"İptal\" tuşuna basarak yüklemekten vazgeçebilirsiniz"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Kurulum başarısız oldu"
 
@@ -825,7 +828,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Sihirbaz, Intranet/Internet FTP Sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -932,6 +935,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web Sunucusu Yapılandırma Sihirbazı"
@@ -940,17 +950,21 @@ msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
@@ -961,27 +975,22 @@ msgstr ""
 msgid "Hostname:"
 msgstr "Bİlgisayar Adı"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS Alan:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba sunucusu"
-
 #: ../ldap_wizard/ldap.pm:59
 #, fuzzy
 msgid "Server - Set configuration of LDAP server"
@@ -1242,7 +1251,7 @@ msgstr ""
 "Sihirbaz, İnternet Haber Servislerinizi yapılandırmak için\n"
 " gereken parametreleri şu şekilde belirledi:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1554,23 +1563,23 @@ msgstr ""
 "Giden postaların \"Kimden:\" ve \"Yanıtla\" alanlarında görünecek olan "
 "adresleri seçebilirsiniz."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Maske; \"mydomain.com\" gibi geçerli bir alan adı olmalıdır !"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Maskelenen alan adı:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Uyarı:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Posta geçidi için boş bir adres yazdınız."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1579,7 +1588,7 @@ msgstr ""
 "gönderemeyeceksiniz. Devam etmek için İleri'ye, bir değer girmek için "
 "Geri'ye basın."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1587,7 +1596,7 @@ msgstr ""
 "Hata, yüklü sendmail bulundu. Postfix yüklemeden önce sendmail programını "
 "kaldırmanız gerekir."
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1598,12 +1607,12 @@ msgstr ""
 "sağlayıcınız \"saglayici.com\" ise internet posta sunucusu genellikle \"smtp."
 "saglayici.com\" 'dur."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Posta Geçidi"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1611,17 +1620,17 @@ msgstr ""
 "Sunucunuz gidenleri, son dağımtımla ilgilenecek olan bir posta geçidinden "
 "gönderecek."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Posta Sunucusu İsmi:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Öntanımlı olarak 'alan adımı da ekle' aktiftir. Küçük siteler için oldukça "
 "iyi bir seçim."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1629,15 +1638,15 @@ msgstr ""
 "Merkezim parametresi yerel ağda gönderilmiş e-postaların kimden geldiğini "
 "belirtmek için kullanılır. "
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "merkezim:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Harici posta sunucusu yapılandırılıyor"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1645,35 +1654,35 @@ msgstr ""
 "Harici Posta Sunucunuzu yapılandırmak için gereken parametreleri sihirbaz şu "
 "şekilde belirledi:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Adres Yapısı"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "merkezim"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "Sihirbaz, şimdi dahili (ağ) posta sunucunuzu yapılandıracak."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Sihirbaz, harici posta sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix Posta Sunucusu"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "Çakışmalardan kaçınmak için, sendmail yüklü mü kontrol edin..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Postfix sunucunuz yapılandırılıyor....."
 
@@ -1898,7 +1907,7 @@ msgid "Set PXE server"
 msgstr "PXE sunucu kur"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1910,7 +1919,7 @@ msgid "Modify boot image in PXE"
 msgstr "PXE açılış imajı değiştir"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/uk.po b/po/uk.po
index 2211bd8e..fd3a6470 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-28 04:12+0200\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "��ͦ���� ������������"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "������������."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "�������."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -129,9 +127,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "�� ����������� � dhcp, ������ ���� �� ��������� � ����� ���Ʀ����æ��."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "�������"
 
@@ -290,7 +288,7 @@ msgstr "��ͦ���� ��Ц��� ���������� ���צ�� DHCP �� ������ �����Ҧ."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -469,7 +467,7 @@ msgstr ""
 "��������, �� ������ ��� � ���Ʀ����æ� DNS... �����Φ�� \"��̦\" ��� "
 "�����������"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "�������:"
 
@@ -614,15 +612,20 @@ msgstr "������ ������������ ��������"
 msgid "PXE server"
 msgstr "������ PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "������ �����"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "��¦� ��ͦ����� Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "���� �����, ����Ҧ�� ��ͦ�����"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -631,7 +634,7 @@ msgstr ""
 "%s �� �����������\n"
 "�����Φ�� \"��̦\", ��� ����������, ��� \"���������\", ��� �����"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "������������ ����������� �������"
 
@@ -794,7 +797,7 @@ msgstr "��������� FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� ��������/�������� FTP-������"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -892,6 +895,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "��ͦ���� ������������ ���-�������"
@@ -900,17 +910,21 @@ msgstr "��ͦ���� ������������ ���-�������"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "������:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "������:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "��ͦ���� ��Ц��� ���������� ������ ��������-����� �� ������ �����Ҧ."
@@ -920,27 +934,22 @@ msgstr "��ͦ���� ��Ц��� ���������� ������ ��������-����� �� ������ �����Ҧ."
 msgid "Hostname:"
 msgstr "����� ������"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "����� NIS:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "������������ ������� PXE �� ��ۦ� �����ͦ..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "������ �����"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Server - ���������� ���Ʀ����æ� ������� LDAP"
@@ -1193,7 +1202,7 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ���צ�� "
 "��������-�����:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1490,23 +1499,23 @@ msgstr ""
 "�� ������ ������� ��� ������, ��� ������������ ��Ȧ��� ����� � ����� \"���:"
 "\" � \"�����צ���\"."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "����� ��� ���� ���������� ������ ������, �� \"ͦ������.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "��������� ����� ������:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "������������:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "�� ����� ������� ������ ��� ����� �����."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1515,7 +1524,7 @@ msgstr ""
 "���ϧ �������ϧ ����֦. �����Φ�� \"��̦\", ��� ����������, ��� \"�����\", "
 "��� ������ ��������."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1523,7 +1532,7 @@ msgstr ""
 "�������, ����������� sendmail, ����-�����, ����̦�� ���� ����� ������������� "
 "� ������������� Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1533,12 +1542,12 @@ msgstr ""
 "\"; ���������, ���� ��� ��������� \"provider.com\", �� ������ ����� "
 "��������� � \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "���� ��������-�����"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1546,16 +1555,16 @@ msgstr ""
 "��� ������ ���� צ������� ��Ȧ��� ����� ����� �������� ����, ���� ������ ��� "
 "��������� ��������."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "����� ������� �����:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "������� � ������ myhostname, �� �������� ��� ����� ���Ԧ�."
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1563,16 +1572,16 @@ msgstr ""
 "�������� myorigin ����դ �����, ���� Ʀ���դ צ���������� � �������� "
 "צ�������Φ� ���Ԧ"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "������������ ��������-�����"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1581,36 +1590,36 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ������ "
 "���צ�� ��������-�����:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "����� ������"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "��ͦ���� ��Ц��� ���������� ������ ��������-����� �� ������ �����Ҧ."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "��ͦ���� ��Ц��� ���������� ��� ����Ӧ-������."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "������ Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "��� ��������� ����̦��� ����צ���, � ����������� sendmail..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "������������ ������� Postfix..."
 
@@ -1833,7 +1842,7 @@ msgid "Set PXE server"
 msgstr "���������� ������ PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1845,7 +1854,7 @@ msgid "Modify boot image in PXE"
 msgstr "�ͦ���� ����� ������������ � PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/uz.po b/po/uz.po
index 77356b72..73224ef7 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-29 23:15-0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "мослаш учун ёрдамчи"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Диққат."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Хато."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgstr ""
 "Сиз DHCP'дан фойдаланаяпсиз, сервер бу мосламалар билан ишламаши мумкин."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хато"
 
@@ -281,7 +279,7 @@ msgstr "Ёрдамчи DHCP хизматларини муваффақиятли
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -436,7 +434,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Хато:"
 
@@ -577,15 +575,20 @@ msgstr "Mandrake ўрнатиш сервери"
 msgid "PXE server"
 msgstr "PXE сервери"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba сервери"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Дракёрдамчиси - Ёрдамчини танлаш"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Илтимос ёрдамчини танланг"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -594,7 +597,7 @@ msgstr ""
 "%s ўрнатилмаган\n"
 "Ўрнатиш учун \"Кейингиси\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
@@ -747,7 +750,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Ёрдамчи Интранет/Интернет учун FTP серверингизни муваффақиятли мослади."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -841,6 +844,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Веб серверини мослаш учун ёрдамчи"
@@ -849,17 +859,21 @@ msgstr "Веб серверини мослаш учун ёрдамчи"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Махфий сўз:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ўрнатиш сервери қуйидаги параметрлар билан мосланади"
@@ -869,26 +883,21 @@ msgstr "Ўрнатиш сервери қуйидаги параметрлар б
 msgid "Hostname:"
 msgstr "Сервернинг номи:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Samba сервери мосланмоқда..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba сервери"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr ""
@@ -1123,7 +1132,7 @@ msgstr ""
 "Интернет янгиликлар хизматини мослаш учун ёрдамчи қуйидаги параметрларни "
 "аниқлади:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1404,23 +1413,23 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Диққат:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1429,52 +1438,52 @@ msgstr ""
 "жўнатолмайсиз. Давом этиш учун \"Кейингиси\"ни, қийматни киритиш учун "
 "\"Орқага\"ни босинг "
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Хат-хабар серверининг номи:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Ташқи хат-хабар сервери мосланмоқда"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1482,32 +1491,32 @@ msgstr ""
 "Ташқи хат-хабар хизматини мослаш учун ёрдамчи қуйидаги параметрларни "
 "аниқлади:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Ёрдамчи ташқи хат-хабар серверингизни муваффақиятли мослади."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix сервери"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Postfix сервери мосланмоқда..."
 
@@ -1715,7 +1724,7 @@ msgid "Set PXE server"
 msgstr "PXE серверини ўрнатиш"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1727,7 +1736,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 506407a4..eaeac3fd 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-29 23:15-0500\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "moslash uchun yordamchi"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,8 +29,7 @@ msgid "Warning."
 msgstr "Diqqat."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "Xato."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -129,9 +127,9 @@ msgstr ""
 "Siz DHCP'dan foydalanayapsiz, server bu moslamalar bilan ishlamashi mumkin."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xato"
 
@@ -286,7 +284,7 @@ msgstr "Yordamchi DHCP xizmatlarini muvaffaqiyatli mosladi."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -441,7 +439,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Xato:"
 
@@ -582,15 +580,20 @@ msgstr "Mandrake o'rnatish serveri"
 msgid "PXE server"
 msgstr "PXE serveri"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba serveri"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakyordamchisi - Yordamchini tanlash"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Iltimos yordamchini tanlang"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -600,7 +603,7 @@ msgstr ""
 "O'rnatish uchun \"Keyingisi\" yoki chiqish uchun \"Bekor qilish\" tugmasini "
 "bosing"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
@@ -755,7 +758,7 @@ msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Yordamchi Intranet/Internet uchun FTP serveringizni muvaffaqiyatli mosladi."
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -849,6 +852,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Veb serverini moslash uchun yordamchi"
@@ -857,17 +867,21 @@ msgstr "Veb serverini moslash uchun yordamchi"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Maxfiy so'z:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "O'rnatish serveri quyidagi parametrlar bilan moslanadi"
@@ -877,26 +891,21 @@ msgstr "O'rnatish serveri quyidagi parametrlar bilan moslanadi"
 msgid "Hostname:"
 msgstr "Serverning nomi:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Samba serveri moslanmoqda..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba serveri"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr ""
@@ -1131,7 +1140,7 @@ msgstr ""
 "Internet yangiliklar xizmatini moslash uchun yordamchi quyidagi "
 "parametrlarni aniqladi:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1415,23 +1424,23 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Diqqat:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1440,52 +1449,52 @@ msgstr ""
 "jo'natolmaysiz. Davom etish uchun \"Keyingisi\"ni, qiymatni kiritish uchun "
 "\"Orqaga\"ni bosing "
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "Xat-xabar serverining nomi:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Tashqi xat-xabar serveri moslanmoqda"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1493,32 +1502,32 @@ msgstr ""
 "Tashqi xat-xabar xizmatini moslash uchun yordamchi quyidagi parametrlarni "
 "aniqladi:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "Yordamchi tashqi xat-xabar serveringizni muvaffaqiyatli mosladi."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix serveri"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Postfix serveri moslanmoqda..."
 
@@ -1728,7 +1737,7 @@ msgid "Set PXE server"
 msgstr "PXE serverini o'rnatish"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1740,7 +1749,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/vi.po b/po/vi.po
index 8db380ab..79984d98 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-04 12:31+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -24,8 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "đồ thuật cấu hình"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,8 +33,7 @@ msgid "Warning."
 msgstr "Cảnh báo."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -45,10 +43,10 @@ msgstr "Lỗi."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -133,9 +131,9 @@ msgstr ""
 "Bạn đang trong DHCP, máy chủ có thể không hoạt động với cấu hình của bạn."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Lỗi"
 
@@ -292,7 +290,7 @@ msgstr "Đồ thuật đã cấu hình thành công các dịch vụ DHCP cho m�
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 #, fuzzy
@@ -465,7 +463,7 @@ msgid ""
 "continue"
 msgstr "Có lẽ host đó đã có trong cấu hình DNS... nhấn Tiếp Theo để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Lỗi:"
 
@@ -611,15 +609,20 @@ msgstr "Máy chủ cài đặt Mandrake"
 msgid "PXE server"
 msgstr "Máy chủ PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Máy chủ Samba"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Chọn đồ thuật Drakwizard"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Hãy chọn đồ thuật"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -628,7 +631,7 @@ msgstr ""
 "%s chưa được cài đặt\n"
 "Nhấn \"Tiếp theo\" để cài đặt hay \"Bỏ Qua\" để thoát ra"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
@@ -793,7 +796,7 @@ msgstr "Cho phép FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ FTP cho Intranet/Internet"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
@@ -895,6 +898,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Đồ Thuật Cấu hình Máy Chủ WEB"
@@ -903,17 +913,21 @@ msgstr "Đồ Thuật Cấu hình Máy Chủ WEB"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "Mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Bây giờ sẽ thay đổi các tùy chọn khởi động trong ảnh"
@@ -923,27 +937,22 @@ msgstr "Bây giờ sẽ thay đổi các tùy chọn khởi động trong ảnh"
 msgid "Hostname:"
 msgstr "Tên Chủ"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS Domain:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Đang cấu hình máy chủ PXE ...."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Máy chủ Samba"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Máy chủ - Lập cấu hình máy chủ LDAP"
@@ -1194,7 +1203,7 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây\n"
 "cần để cấu hình Dịch Vụ Internet News của bạn:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1504,23 +1513,23 @@ msgstr ""
 "Bạn có thể chọn loại địa chỉ mà thư đi sẽ hiển thị trong trường \"Từ:\" và "
 "\"Trả lời cho\" ."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "Masquerade domain name:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Cảnh báo:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Bạn đã nhập một địa chỉ trống cho gateway thư."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1529,7 +1538,7 @@ msgstr ""
 "thư ra ngoài mạng. Nhấn Tiếp Theo (next) để tiếp tục hoặc Trở Lại (back) để "
 "nhập một giá trị."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
@@ -1537,7 +1546,7 @@ msgstr ""
 "Lỗi, sendmail đã được cài đặt, hãy gỡ bỏ nó trước khi cài đặt và cấu hình "
 "Postfix"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1547,12 +1556,12 @@ msgstr ""
 "\"; ví dụ: nếu nhà cung cấp là \"provider.com\", thì máy chủ thư internet sẽ "
 "luôn luôn là \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1560,31 +1569,31 @@ msgstr ""
 "Máy chủ của bạn sẽ gửi thư đi qua một mail gateway mà nó sẽ lo việc phân "
 "phối cuối cùng."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "Tên máy chủ Mail:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "Cấu hình Internet Mail"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
@@ -1593,38 +1602,38 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Dịch Vụ Internet "
 "Mail của bạn:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "Mẫu địa chỉ"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Đồ thuật hoàn thành cấu hình dịch vụ Internet Mail cho máy chủ của bạn."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "Đồ thuật hoàn thành cấu hình máy chủ PXE của bạn."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Máy chủ Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 "Hãy kiểm tra xem sendmail đã được cài đặt hay chưa để tránh xung đột...."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Cấu hình máy chủ Postfix..."
 
@@ -1846,7 +1855,7 @@ msgid "Set PXE server"
 msgstr "Lập máy chủ PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1858,7 +1867,7 @@ msgid "Modify boot image in PXE"
 msgstr "Thay đổi ảnh khởi động trong PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/wa.po b/po/wa.po
index 9300aeb2..f71565ec 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-28 13:53+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -25,8 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Macrea d' apontiaedje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -35,8 +34,7 @@ msgid "Warning."
 msgstr "Adviertixhmint."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -46,10 +44,10 @@ msgstr "Aroke."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -136,9 +134,9 @@ msgstr ""
 "Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Aroke"
 
@@ -300,7 +298,7 @@ msgstr "Li macrea a-st apontyî comifåt les siervices DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -482,7 +480,7 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "Aroke:"
 
@@ -621,15 +619,19 @@ msgstr "Sierveu d' astalaedje di Mandrake"
 msgid "PXE server"
 msgstr "Sierveu PXE"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+msgid "Kolab server"
+msgstr "Sierveu Kolab"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Tchoezixhaedje do macrea"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "Tchoezixhoz on macrea s' i vs plait"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -638,7 +640,7 @@ msgstr ""
 "%s n' est nén astalé\n"
 "Clitchîz so «Shuvant» po l' astaler ou so «Rinoncî» po cwiter"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
@@ -794,7 +796,7 @@ msgstr ""
 "Li macrea a-st apontyî comifåt vosse sierveu FTP pol rantoele locåle eyet "
 "pol daegntoele"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Renondez l' macrea, et s' sayîz d' candjî kékes parametes."
@@ -889,6 +891,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Bénvnowe å macrea d' apontiaedje do sierveu d' ovraedje e groupe Kolab."
@@ -897,16 +906,20 @@ msgstr ""
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "Ritapez l' sicret:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Li macrea va asteure apontyî li sierveu Kolab avou ces parametes ci:"
 
@@ -914,11 +927,11 @@ msgstr "Li macrea va asteure apontyî li sierveu Kolab avou ces parametes ci:"
 msgid "Hostname:"
 msgstr "No do lodjoe:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "Dominne d' emilreye:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
@@ -927,14 +940,10 @@ msgstr ""
 "«manager» (manaedjeu), avou li scret ki vos avoz dné, sol hårdêye "
 "https://127.0.0.1/kolab/admin/."
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 msgid "Configuring Kolab server on your system..."
 msgstr "Apontiaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../kolab_wizard/Kolab.pm:134
-msgid "Kolab server"
-msgstr "Sierveu Kolab"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "Sierveu - Defini l' apontiaedje do sierveu LDAP"
@@ -1170,7 +1179,7 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants,\n"
 "k' end a mezåjhe po-z apontyî vosse siervice di copinreyes usenet:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1463,46 +1472,46 @@ msgstr ""
 "Vos ploz tchoezi li sôre d' adresse ki les emiles e rexhowe åront dins leus "
 "tchamps «From» eyet «Reply-To»."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "Adviertixhmint:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vos avoz dné ene vude adresse pol pasrele d' emilaedje."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Pasrele d' emilaedje sol daegntoele"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1510,15 +1519,15 @@ msgstr ""
 "Vosse sierveu evoyrè les messaedjes åd triviè d' ene pasrele d' emilaedje, "
 "ki s' ocuprè di ls evoyî disk' al destinåcion finåle."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "No do sierveu d' emilaedje:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1526,15 +1535,15 @@ msgstr ""
 "Li paramete «myorigin» dene li no d' dominne k' ont l' air d' î vni les "
 "messaedjes evoyîs a pårti d' chal."
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "oridjinne locåle:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "Apontiaedje do sierveu d' emilaedje sol daegntoele"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
@@ -1542,34 +1551,34 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse siervice d' emilaedje sol daegntoele:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "Cogne di l' adresse"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr ""
 "Li macrea va asteure apontyî on sierveu d' emilaedje sol rantoele locåle."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr ""
 "Li macrea a-st apontyî comifåt vosse sierveu d' emilaedje sol daegntoele."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Sierveu Postfix"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr "oistant sendmail, po-z eviter les conflits..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "Apontiaedje do sierveu d' emilaedje postfix da vosse..."
 
@@ -1790,8 +1799,8 @@ msgid "Set PXE server"
 msgstr "Defini sierveu PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
-msgstr ""
+msgid "Add boot image (Mandrake release < 9.2)"
+msgstr "Radjouter ene imådje d' enondaedje (Modêyes di Mandrake < 9.2)"
 
 #: ../pxe_wizard/Pxe.pm:87
 msgid "Remove boot image in PXE"
@@ -1802,8 +1811,8 @@ msgid "Modify boot image in PXE"
 msgstr "Candjî ene imådje d' enondaedje e PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
-msgstr ""
+msgid "Add all.rdz image (Mandrake release > 10.0)"
+msgstr "Radjouter ene imådje all.rdz (Modêyes di Mandrake > 10.0)"
 
 #: ../pxe_wizard/Pxe.pm:111
 msgid "PXE wizard"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 371395fd..ecf87fde 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-03-06 12:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -26,8 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "配置向导"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,8 +35,7 @@ msgid "Warning."
 msgstr "警告。"
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -47,10 +45,10 @@ msgstr "出错。"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -128,9 +126,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
 
@@ -280,7 +278,7 @@ msgstr "向导成功地配置了 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -447,7 +445,7 @@ msgid ""
 "continue"
 msgstr "看起来主机已经在您的 DNS 配置中了...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "错误:"
 
@@ -588,15 +586,20 @@ msgstr "Mandrake 安装服务器"
 msgid "PXE server"
 msgstr "PXE 服务器"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba 服务器"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "选择 Drakwizard 向导"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "请选择一个向导"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -605,7 +608,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -755,7 +758,7 @@ msgstr "允许 FXP"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
@@ -852,6 +855,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 
@@ -859,16 +869,20 @@ msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "密码:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 msgid "Password again:"
 msgstr "重输密码:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "向导现在将用此参数配置 Kolab 服务器"
 
@@ -876,11 +890,11 @@ msgstr "向导现在将用此参数配置 Kolab 服务器"
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 msgid "Mail domain:"
 msgstr "邮件域名:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 #, fuzzy
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
@@ -888,16 +902,11 @@ msgid ""
 msgstr ""
 "kolab 服务器现已配置并运行起来了。请以用户名“manager”及您输入的密码登录。"
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 PXE 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba 服务器"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "服务器 - 设置 LDAP 服务器的配置"
@@ -1142,7 +1151,7 @@ msgid ""
 "Internet News service:"
 msgstr "为了配置 Internet 新闻组服务，向导收集了下列需要的参数:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1426,23 +1435,23 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr "您可以选择发出邮件在“From:”和“Reply-to”字段显示的地址类型。"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "伪装必须是有效的域名，如“mydomain.com”！"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "伪装域名:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "您输入的邮件网关地址是空的。"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1450,13 +1459,13 @@ msgstr ""
 "您的选择可以被接受，不过那样您将不能发送邮件到您的局域网以外。点击“下一步”继"
 "续，或“后退”并输入一个值。"
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr "出错，已经安装 sendmail，请在安装并配置 Postfix 前先删除该软件"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1465,71 +1474,71 @@ msgstr ""
 "Internet 主机名必须采用下列格式“host.domain.domaintype”；例如，您的服务商"
 "是“provider.com”，邮件服务器通常就是“smtp.provider.com”。"
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway"
 msgstr "Internet 邮件网关"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "您的服务器将使用一个邮件网关发出邮件，它会负责最终的投递。"
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
 msgstr "邮件服务器名:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr "默认是附加 myhostname，这对小站点很好。"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr "myorigin 参数指定了本地发出的邮件中“来自”一栏中要出现的域"
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid "Configuring the external mail server"
 msgstr "配置外部邮件服务器"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "为了配置外部邮件服务器，向导收集了下列需要的参数:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 msgid "Form of the address"
 msgstr "地址格式"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 msgid "The wizard will now configure an internal mail server."
 msgstr "向导现在将配置 Internet 邮件服务器。"
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 msgid "The wizard successfully configured your external mail server."
 msgstr "向导成功地配置了您的外部邮件服务器。"
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix 服务器"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 #, fuzzy
 msgid "removing Sendmail to avoid conflict...."
 msgstr "请检查是否已安装 sendmail，以避免冲突..."
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "正在配置您的 Postfix 服务器..."
 
@@ -1738,7 +1747,7 @@ msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1750,7 +1759,7 @@ msgid "Modify boot image in PXE"
 msgstr "修改 PXE 中的启动映像"
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0eb4cfbd..ecdadb69 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-10 23:14+0100\n"
+"POT-Creation-Date: 2004-03-11 15:12+0100\n"
 "PO-Revision-Date: 2004-02-21 22:10+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -21,8 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "�]�w���F"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106
-#: ../kolab_wizard/Kolab.pm:81 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,8 +30,7 @@ msgid "Warning."
 msgstr "ĵ�i."
 
 #: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:189 ../ftp_wizard/Proftpd.pm:121
-#: ../kolab_wizard/Kolab.pm:85 ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
 #: ../samba_wizard/Samba.pm:87 ../samba_wizard/Samba.pm:103
 #: ../samba_wizard/Samba.pm:164 ../samba_wizard/Samba.pm:201
 #: ../web_wizard/Apache.pm:117 ../web_wizard/Apache.pm:125
@@ -42,10 +40,10 @@ msgstr "���~."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:245
 #: ../dns_wizard/Bind.pm:255 ../dns_wizard/Bind.pm:262
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:99
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:101
 #: ../ldap_wizard/ldap.pm:172 ../news_wizard/Inn.pm:95
 #: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:172 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
 #: ../samba_wizard/Samba.pm:227 ../web_wizard/Apache.pm:146
@@ -124,9 +122,9 @@ msgid "You are in dhcp, server may not work with your configuration."
 msgstr "�z���b dncp ��, ���A���i�ण��P�z���]�w�B�@."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
-#: ../drakwizard.pl:90 ../drakwizard.pl:140 ../drakwizard.pl:144
-#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:89
+#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:72
+#: ../drakwizard.pl:91 ../drakwizard.pl:141 ../drakwizard.pl:145
+#: ../ldap_wizard/ldap.pm:168 ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "���~"
 
@@ -273,7 +271,7 @@ msgstr "�o���F���\���z�����A���]�w DHCP �A��."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:269
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:177 ../pxe_wizard/Pxe.pm:331
 #: ../samba_wizard/Samba.pm:232 ../web_wizard/Apache.pm:152
 msgid "Failed"
@@ -440,7 +438,7 @@ msgid ""
 "continue"
 msgstr "���G�D���w�g�s�b��z�� DNS �պA�]�w��... ���U�U�@�B�H�~��"
 
-#: ../dns_wizard/Bind.pm:194
+#: ../dns_wizard/Bind.pm:194 ../kolab_wizard/Kolab.pm:75
 msgid "Error:"
 msgstr "���~:"
 
@@ -582,15 +580,20 @@ msgstr "Mandrake �w�˦��A��"
 msgid "PXE server"
 msgstr "PXE ���A��"
 
-#: ../drakwizard.pl:59
+#: ../drakwizard.pl:54 ../kolab_wizard/Kolab.pm:140
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba ���A��"
+
+#: ../drakwizard.pl:60
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard ���F���"
 
-#: ../drakwizard.pl:60
+#: ../drakwizard.pl:61
 msgid "Please select a wizard"
 msgstr "�п�ܺ��F"
 
-#: ../drakwizard.pl:140
+#: ../drakwizard.pl:141
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -599,7 +602,7 @@ msgstr ""
 "%s �S���w��\n"
 "�n�w���I�� \"Next �U�@�B\" �� \"Cancel ����\" ���}"
 
-#: ../drakwizard.pl:144
+#: ../drakwizard.pl:145
 msgid "Installation failed"
 msgstr "�w�˥���"
 
@@ -750,7 +753,7 @@ msgstr ""
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "���F���\�]�w�z����������/���ں��� FTP ���A��"
 
-#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 #, fuzzy
 msgid "Please relaunch drakwizard, and try to change some parameters."
@@ -848,6 +851,13 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:59
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:59
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "�������A���]�w���F"
@@ -856,17 +866,21 @@ msgstr "�������A���]�w���F"
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:74 ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:75
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81 ../kolab_wizard/Kolab.pm:93
 #: ../ldap_wizard/ldap.pm:89 ../ldap_wizard/ldap.pm:128
 msgid "Password:"
 msgstr "�K�X:"
 
-#: ../kolab_wizard/Kolab.pm:75
+#: ../kolab_wizard/Kolab.pm:83
 #, fuzzy
 msgid "Password again:"
 msgstr "�K�X:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:88
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "���F���\�]�w�z�����A�������ں����q�l�A��."
@@ -876,27 +890,22 @@ msgstr "���F���\�]�w�z�����A�������ں����q�l�A��."
 msgid "Hostname:"
 msgstr "�D���W��"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:95
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS ����:"
 
-#: ../kolab_wizard/Kolab.pm:99
+#: ../kolab_wizard/Kolab.pm:101
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:134
+#: ../kolab_wizard/Kolab.pm:140
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "���b�]�w�z�� Samba ���A��..."
 
-#: ../kolab_wizard/Kolab.pm:134
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba ���A��"
-
 #: ../ldap_wizard/ldap.pm:59
 msgid "Server - Set configuration of LDAP server"
 msgstr "���A�� - �]�w LDAP ���A���պA"
@@ -1133,7 +1142,7 @@ msgstr ""
 "���F������H�U�ݭn�]�w�z��\n"
 "���ں����s�D�A�Ȫ��Ѽ�:"
 
-#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the next button or "
@@ -1423,23 +1432,23 @@ msgid ""
 "\"From:\" and \"Reply-to\" field."
 msgstr "�z�i�H��ܥ~�X�q�l����ܦb \"From:\" �� \"Reply-to\" ��쪺�a�}����."
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:93
 msgid "Masquerade domain name:"
 msgstr "���˪�����W��:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "Warning:"
 msgstr "ĵ�i:"
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid "You entered an empty address for the mail gateway."
 msgstr "�z��J�@�Ӫťժ��q�l�h�D��}."
 
-#: ../postfix_wizard/Postfix.pm:99
+#: ../postfix_wizard/Postfix.pm:98
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1447,13 +1456,13 @@ msgstr ""
 "�z����ܥi�H�Q����, ���o�N���|��\�z�ǰe�l���z�����a�ݺ����~.���U�@�B�~��, "
 "�ΤW�@�����s��J�ƭ�."
 
-#: ../postfix_wizard/Postfix.pm:103
+#: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed, please remove it before install and configure "
 "Postfix"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the Internet mail server is "
@@ -1462,77 +1471,77 @@ msgstr ""
 "���ں����D���W�٥����H\"host.domain.domaintype\"���榡�R�W; �Ҧp, �p�G�z����"
 "���̬O\"provider.com\", �����ں����q�l���A���`�O\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:109 ../postfix_wizard/Postfix.pm:136
+#: ../postfix_wizard/Postfix.pm:108 ../postfix_wizard/Postfix.pm:135
 #, fuzzy
 msgid "Internet mail gateway"
 msgstr "���ں����q�l�h�D"
 
-#: ../postfix_wizard/Postfix.pm:109
+#: ../postfix_wizard/Postfix.pm:108
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "�z�����A���|�g�ѹq�l�h�D�Ӷǰe�~�X�q�l, �q�l�h�D�|�B�z�̲ת��뻼�u�@."
 
-#: ../postfix_wizard/Postfix.pm:115
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid "Mail server name:"
 msgstr "�q�l���A���W��:"
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:120
+#: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:125
+#: ../postfix_wizard/Postfix.pm:124
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid "Configuring the external mail server"
 msgstr "���b�]�w���ں����q�l�l����A��"
 
-#: ../postfix_wizard/Postfix.pm:134
+#: ../postfix_wizard/Postfix.pm:133
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr "���F������H�U�ݭn�]�w�z�����ں����q�l�A�Ȫ��Ѽ�:"
 
-#: ../postfix_wizard/Postfix.pm:137
+#: ../postfix_wizard/Postfix.pm:136
 #, fuzzy
 msgid "Form of the address"
 msgstr "�a�}����"
 
-#: ../postfix_wizard/Postfix.pm:138
+#: ../postfix_wizard/Postfix.pm:137
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:144
+#: ../postfix_wizard/Postfix.pm:143
 #, fuzzy
 msgid "The wizard will now configure an internal mail server."
 msgstr "���F���\�]�w�z�����A�������ں����q�l�A��."
 
-#: ../postfix_wizard/Postfix.pm:149
+#: ../postfix_wizard/Postfix.pm:148
 #, fuzzy
 msgid "The wizard successfully configured your external mail server."
 msgstr "���F���\�a�]�w�z�� PXE ���A��."
 
-#: ../postfix_wizard/Postfix.pm:171 ../postfix_wizard/Postfix.pm:231
-#: ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:258
 msgid "Postfix Server"
 msgstr "Postfix ���A��"
 
-#: ../postfix_wizard/Postfix.pm:171
+#: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:231 ../postfix_wizard/Postfix.pm:259
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:258
 msgid "Configuring your Postfix server....."
 msgstr "���b�]�w�z�� Postfix ���A��....."
 
@@ -1740,7 +1749,7 @@ msgid "Set PXE server"
 msgstr "�]�w PXE ���A��"
 
 #: ../pxe_wizard/Pxe.pm:86
-msgid "Add boot (Mandrake release < 9.2"
+msgid "Add boot image (Mandrake release < 9.2)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:87
@@ -1752,7 +1761,7 @@ msgid "Modify boot image in PXE"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:89
-msgid "Add all.rdz (Mandrake release > 10.0)"
+msgid "Add all.rdz image (Mandrake release > 10.0)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:111