Updated POT file.

65 files changed, 9215 insertions, 8637 deletions

diff --git a/po/ar.po b/po/ar.po
index d53c0008..07c113be 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-24 23:27+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -30,8 +30,8 @@ msgstr "معالج التهيئة"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "تحذير."
 
@@ -43,17 +43,17 @@ msgstr "خطأ."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "تهانينا"
 
@@ -126,42 +126,42 @@ msgid "Warning"
 msgstr "تحذير"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "خطأ"
 
@@ -221,15 +221,6 @@ msgstr ""
 "تحتاج لإعادة ضبط إسم مجالك. لخادم DNS، تحتاج لإسم مجال صحيح، غير مساو للمجال "
 "المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "لا يزال الأمر مشتغلا. هل تريد قتله و الخروج من المعالج ؟"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "إغلق"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "معالج DHCP"
@@ -314,8 +305,8 @@ msgstr "قام المعالج بتهيئة المعاملات التالية و
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "معطل"
 
@@ -323,8 +314,8 @@ msgstr "معطل"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "ممكّن"
 
@@ -342,13 +333,13 @@ msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "فشِل"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "أعد تشغيل drakewizard، وحاول تغيير بعض البارمترات."
 
@@ -653,19 +644,24 @@ msgstr "خادم الأخبار"
 msgid "NFS server"
 msgstr "خادم NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "خادم كولاب (Kolab)"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "خادم FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "اختيار المعالج من Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "فضلاً اختر معالج"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -674,7 +670,7 @@ msgstr ""
 "%s غير مثبّت\n"
 "أنقر على \"التّالي\" للتّثبيت أو على \"إلغي\" للخروج"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "التركيب فشل"
 
@@ -950,11 +946,6 @@ msgstr "معالج تهيئة Kolab"
 msgid "Master kolab server"
 msgstr "خادم DNS الرئيسى"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "خادم DNS التّابع"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -985,22 +976,22 @@ msgstr "مرحبا في معالج إعداد خادم البرامج الجما
 msgid "Master or slave Kolab server"
 msgstr "خادم DNS الرئيسى"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "لقد قمت بتهيئة خادم Ldap مسبقاً"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "خادم DNS التّابع"
@@ -1076,7 +1067,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1110,21 +1104,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "خادم كولاب معدّ و يشتغل الآن. أدخل كمدير (manager) بكلمة المرور الّتي أدخلتها "
 "في https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "يجري إعداد خادم كولاب على نظامك..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "خادم كولاب (Kolab)"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "معالج Ldap"
@@ -1467,7 +1462,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "الدليل:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "المسار الذي أدخلته غير موجود"
 
@@ -2103,7 +2098,7 @@ msgstr ""
 "قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3744,19 +3739,19 @@ msgstr "يجري إعداد خادم سامبا الخاصّ بك..."
 msgid "OpenSSH server"
 msgstr "خادم Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "معالج الوقت"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "حاول مرة أخرى"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "احفظ التهيئة بدون اختبار"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3764,15 +3759,15 @@ msgstr ""
 "معالج الوقت يساعدك على تعيين التوقيت في الخادم الخاص بك متزامناً مع خادم "
 "توقيت خارجي"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "و بهذا يكون خادمك هو خادم الوقت المحلي لشبكتك."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "اضغط التالي للبدء, أو الغاء لمغادرة هذا المعالج"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3780,35 +3775,35 @@ msgstr ""
 "(نوصي باستعمال الخادم pool.ntp.org مرّتين بما أنّ هذا الخادم يشير عشوائيا إلى "
 "خوادم الوقت المتوفّرة)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "اختر خادم أساسي و ثانوي من القائمة"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "خدّام الوقت"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "خادم الوقت الأساسي:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "خادم الوقت الثّانوي:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "إختر منطقة زمنية"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "اختر منطقة زمنية:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "إختر مدينة:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3816,46 +3811,46 @@ msgstr ""
 "اذا كان هذا الخادم غير متوفر حالاً (الشبكة أو أي سبب آخر), سيكون هناك تأخير "
 "لثلاثين ثانية."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "اضغط التالي لبدء اختبار خادمات الوقت."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "جاري اختبار وجود الخادمات"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "المنطقة الزمنية:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "خادمات الوقت لا تستجيب. الأسباب قد تكون:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- خادمات وقت غير موجودة"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- لا شبكة خارجية"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- أسباب أخرى..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 "- يمكنك محاولة الإتّصال بخادمات الوقت من جديد، أو حفظ الإعداد دون تعيين الوقت."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "تم حفظ تهيئة خادم التوقيت"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "يمكن للخادم الخاص بك أن يتصرف كخادم وقت للشبكة المحلية."
 
@@ -3896,15 +3891,15 @@ msgstr ""
 "يمكن لخادمك أن يلعب دور خادم ويب نحو شبكتك الدّاخلية (إنترانت) و دور خادم ويب "
 "للإنترنت."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "مكّن خادم الويب للإنترانت"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "مكّن خادم الويب للإنترنت"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3914,11 +3909,11 @@ msgstr ""
 "خادمك لـhttp عن طريق http://www.yourserver.com/~user، سيتمّ سؤالك عن إسم هذا "
 "الدّليل لاخقا."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "الوحدات:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3927,7 +3922,7 @@ msgstr ""
 "إسمح أن يكون للمستخدمين دليل في دلائلهم المنزلية\n"
 "متوفّر على خادم http الخاصّ بك عن طريق http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3935,57 +3930,68 @@ msgstr ""
 "أكتب إسم الدّليل الواجب على المستخدمين إنشاؤه في منازلهم (بدون ~/) ليكون "
 "متوفّرا عن طريق http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "عليك إعداد خادم Ldap أولاً."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "دليل http الثّانوي للمستخدم: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Type the path of the directory you want being the document root."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "يجري إعداد خادم الويب"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "جمّع المعالج الوسائط التّالية الضّرورية لإعداد خادم الويب الخاصّ بك"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "خادم الويب للإنترانت:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "خادم ويب الإنترنت:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "دليل المستخدم:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "أعدّ المعالج خادم الويب للإنترانت\\إنترنت بنجاح"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "خادم Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "يجري إعداد نظامك كخادم Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "لا يزال الأمر مشتغلا. هل تريد قتله و الخروج من المعالج ؟"
+
+#~ msgid "Close"
+#~ msgstr "إغلق"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "خادم DNS التّابع"
+
 #~ msgid "Mail domain:"
 #~ msgstr "مجال البريد:"
 
diff --git a/po/az.po b/po/az.po
index 4558cb4a..07f745d4 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -23,8 +23,8 @@ msgstr "quraşdırma sehirbazı"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Xəbərdarlıq."
 
@@ -36,17 +36,17 @@ msgstr "Xəta"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Təbriklər"
 
@@ -127,7 +127,7 @@ msgid "Warning"
 msgstr "Xəbərdarlıq"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -135,37 +135,37 @@ msgstr ""
 "bilər."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Xəta"
 
@@ -221,15 +221,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Bağla"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Sehirbazı"
@@ -320,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "qeyri-fəal"
 
@@ -329,8 +320,8 @@ msgstr "qeyri-fəal"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "fəal"
 
@@ -349,13 +340,13 @@ msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdır
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Bacarılmadı"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -665,19 +656,25 @@ msgstr "Xəbərlər vericisi"
 msgid "NFS server"
 msgstr "NFS vericisi"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba vericisi"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP vericisi"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard sehirbaz seçkisi"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Xahiş edirik bir sehirbaz seçin"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -686,7 +683,7 @@ msgstr ""
 "%s qurulu deyil\n"
 "Qurmaq üçün \"Sonrakı\" ya da çıxmaq üçün \"Ləğv Et\" düyməsinə basın."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
@@ -966,11 +963,6 @@ msgstr "Samba Quraşdırma Sehirbazı"
 msgid "Master kolab server"
 msgstr "Əsas DNS vericisi"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "İkinci DNS vericisi"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -996,22 +988,22 @@ msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 msgid "Master or slave Kolab server"
 msgstr "Əsas DNS vericisi"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "İkinci DNS vericisi"
@@ -1087,7 +1079,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1123,21 +1118,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba vericisi"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap sehirbazı"
@@ -1504,7 +1498,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Qovluq:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Daxil etdiyiniz cığır mövcud deyil."
 
@@ -2145,7 +2139,7 @@ msgid ""
 msgstr "Sehirbaz vəkilinizi quraşdırmaq üçün aşağıdakı parametrləri topladı:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3772,19 +3766,19 @@ msgstr "FTP Vericisi Quraşdırılır"
 msgid "OpenSSH server"
 msgstr "Apache vericisi"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Zaman sehirbazı"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Yenidən sına"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Qurğuları sınamadan qeyd et"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3792,15 +3786,15 @@ msgstr ""
 "Bu sehirbaz sizə xarici bir zaman vericisi ilə sizin vericinizin zamanını "
 "sinxron olaraq dəyişdirməkdə sizə yardım edəcək."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Ona görə də vericiniz şəbəkəniz üçün yerli zaman vericisi olacaq."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "başlamaq üçün sonrakı, sehirbazdan çıxmaq üçün ləğv et düyməsini basın"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 #, fuzzy
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
@@ -3809,35 +3803,35 @@ msgstr ""
 "(sizə pool.ntp.org vericisini iki dəfə işlətməyi məsləhət edirik, ona görə "
 "ki o, təsadüfi olaraq mövcud vaxt vericilərinə istiqamət göstərir)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Siyahıdan birinci və ikinci vericini seçin."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Zaman Vericiləri"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Birinci Zaman Vericisi:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "İkinci Zaman Vericisi:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Vaxt zolağını seç"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Rayonu seç:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Ölkəni seç:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3845,35 +3839,35 @@ msgstr ""
 "Zaman vericisi hazırda mövcud deyilsə (şəbəkə ya da başqa səbəblə), 30 "
 "saniyəlik bir gecikmə olacaq."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Zaman vericilərini sınamaq üçün sonrakı düyməsinə basın."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Zaman vericisinin mövcudiyyəti sınanır"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Vaxt zolağı:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Zaman vericiləri cavab vermir. Səbəblər bunlar ola bilər:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- mövcud olmayan zaman vericiləri"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- xarici şəbəkə yoxdur"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- digər səbəblər..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3882,11 +3876,11 @@ msgstr ""
 "Zaman vericiləri ilə əlaqə qurmaq üçün bunu yenə sınaya bilərsiniz ya da "
 "qurğuları birini seçmədən qeyd edə bilərsiniz."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Zaman verici quraşdırılması qeyd edildi"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "İndi vericiniz şəbəkəniz üçün zaman vericisi olaraq vəzifə görə bilər."
 
@@ -3928,15 +3922,15 @@ msgstr ""
 "Vericiniz, həm yerli şəbəkəniz (intranet) həm də internet üçün veb vericisi "
 "olaraq vəzifə görə bilər."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "İntranet üçün Veb Vericisini Fəallaşdır"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "İnternet üçün Veb Vericisini Fəallaşdır"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3947,11 +3941,11 @@ msgstr ""
 "içində bir cərgə yaratma imkanı verir, bu cərgənin adı biraz sonra sizdən "
 "soluşulacaq."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modullar:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3962,7 +3956,7 @@ msgstr ""
 "içində bir cərgə yaratma imkanı verir, bu cərgənin adı biraz sonra sizdən "
 "soluşulacaq."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3971,59 +3965,66 @@ msgstr ""
 "(~/ olmadan) Artıq bu cərgədəki fayllar http://www.yourserver.com/"
 "~istifadeci_adi ünvanında görüləcək"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "PXE vericisini seç."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "istifadəçi http alt-cərgəsi: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Sənəd kök cərgəsi olmasını istədiyiniz cərgənin cığırını daxil edin."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Sənədlərin kök cərgəsi:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Veb Vericisi Quraşdırılır"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 "Sehirbaz Veb Vericinizi quraşdırmaq üçün aşağıdakı parametrləri topladı"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "İntranet veb vericisi:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "İnternet veb vericisi:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "İstifadəçi cərgəsi: "
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Sehirbaz İntranet/İnternet Veb Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache vericisi"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
+#~ msgid "Close"
+#~ msgstr "Bağla"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "İkinci DNS vericisi"
+
 #, fuzzy
 #~ msgid "Mail domain:"
 #~ msgstr "Nis Domeni:"
diff --git a/po/bg.po b/po/bg.po
index 30d3f5b5..41d0f345 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -22,8 +22,8 @@ msgstr "Конфигурационен магьосник"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Предупреждение"
@@ -36,17 +36,17 @@ msgstr "Грешка"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Поздравления"
 
@@ -125,44 +125,44 @@ msgid "Warning"
 msgstr "Предупреждение"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Грешка"
 
@@ -219,15 +219,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Затвори"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP помощник"
@@ -317,8 +308,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "изключен"
 
@@ -326,8 +317,8 @@ msgstr "изключен"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "включен"
 
@@ -346,13 +337,13 @@ msgstr "Помощникът успешно настрои DHCP услугите
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Неуспешно"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -674,19 +665,25 @@ msgstr "Новинарски сървър"
 msgid "NFS server"
 msgstr "NFS сървър"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Сървър за база данни"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP сървър"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "ДракПомощник избор на помощник"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Моля изберете помощник"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -695,7 +692,7 @@ msgstr ""
 "%s не е инсталирано\n"
 "Натиснете \"Нататък\",за да инсталирате или \"Отказ\" за изход"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
@@ -965,11 +962,6 @@ msgstr "Конфигурационен магьосник"
 msgid "Master kolab server"
 msgstr "NFS сървър"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS сървър"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -995,22 +987,22 @@ msgstr "Помощник за настройка на FTP сървър"
 msgid "Master or slave Kolab server"
 msgstr "NFS сървър"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS сървър"
@@ -1084,7 +1076,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1120,21 +1115,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Сървър за база данни"
-
 #: ../ldap_wizard/Ldap.pm:32
 #, fuzzy
 msgid "Ldap wizard"
@@ -1496,7 +1490,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2111,7 +2105,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3704,111 +3698,111 @@ msgstr "Настройване на FTP сървър"
 msgid "OpenSSH server"
 msgstr "Новинарски сървър"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Сървъри за време"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Вторичен времеви сървър:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Часова зона:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3847,90 +3841,97 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Сървър за база данни"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Потребителска директория:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Новинарски сървър"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Настройване на DNS сървъра"
 
+#~ msgid "Close"
+#~ msgstr "Затвори"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS сървър"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "Потребителска директория:"
diff --git a/po/bn.po b/po/bn.po
index 2911167f..223d13ed 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-03 13:28+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -24,8 +24,8 @@ msgstr "কনফিগারেশনের উইজার্ড"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "সতর্কবাণী।"
 
@@ -37,17 +37,17 @@ msgstr "ত্রুটি।"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "অভিনন্দন"
 
@@ -128,42 +128,42 @@ msgid "Warning"
 msgstr "সতর্কবাণী"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "ত্রুটি"
 
@@ -227,16 +227,6 @@ msgstr ""
 "পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
 "ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"কমান্ডটি এখনো চলছে। আপনি কি এটিকে kill করে উইজার্ড থেকে বের হয়ে যেতে চান?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "বন্ধ"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP উইজার্ড"
@@ -326,8 +316,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "নিষ্ক্রিয়"
 
@@ -335,8 +325,8 @@ msgstr "নিষ্ক্রিয়"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "সক্রিয়"
 
@@ -354,13 +344,13 @@ msgstr "উইজার্ড সাফল্যের সাথে DHCP পর�
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "বিফল"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizard পুনরায় আরম্ভ করুন, এবং কিছু প্যারামিটার পরিবর্তন করুন।"
 
@@ -686,19 +676,24 @@ msgstr "নিউজ সার্ভার"
 msgid "NFS server"
 msgstr "NFS সার্ভার"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab সার্ভার"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP সার্ভার"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard -এর উইজার্ড নির্বাচন"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "অনুগ্রহ করে একটি উইজার্ড নির্বাচন করুন"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -707,7 +702,7 @@ msgstr ""
 "%s ইনস্টল করা নেই\n"
 "\"পরবর্তী-ধাপ\" ক্লিক করে ইনস্টল করুন অথবা \"বাতিল\" ক্লিক করে প্রস্থান করুন"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "ইনস্টলেশন প্রক্রিয়া বিফল হয়েছে"
 
@@ -1001,11 +996,6 @@ msgstr "Kolab কনফিগারেশন উইজার্ড"
 msgid "Master kolab server"
 msgstr "মাস্টার DNS সার্ভার"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "স্লেভ DNS সার্ভার"
-
 # confused as before
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
@@ -1039,22 +1029,22 @@ msgstr "Kolab গ্রুপওয়ের সার্ভার কনফিগ�
 msgid "Master or slave Kolab server"
 msgstr "মাস্টার DNS সার্ভার"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "আপনি ইতিমধ্যেই আপনার Ldap সার্ভার কনফিগার করেছেন"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "স্লেভ DNS সার্ভার"
@@ -1131,7 +1121,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1166,21 +1159,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab সার্ভার কনফিগার করা হয়েছে এবং বর্তমানে চলছে। https://127.0.0.1/kolab/"
 "admin/ -এলেখা পাসওয়ার্ড ব্যবহার করে ম্যানজার' হিসাবে লগ-ইন করুন"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "আপনার সিস্টেমে Kolab সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab সার্ভার"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "সাম্বা উইজার্ড"
@@ -1532,7 +1526,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "ডিরেক্টরি।"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "আপনি লেখা পাথটি বর্তমানে উপস্থিত নেই।"
 
@@ -2197,7 +2191,7 @@ msgid ""
 msgstr "আপনার প্রক্সি কনফিগার করবার জন্য নিম্নলিখিত প্যারামিটার উইজার্ড সংগ্রহ করেছে:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3859,19 +3853,19 @@ msgstr "আপনার সাম্বা সার্ভার কনফিগ
 msgid "OpenSSH server"
 msgstr "অ্যাপাচে সার্ভার"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "টাইম উইজার্ড"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "পুনরায় প্রচেষ্টা করুন"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "বিনা পরীক্ষায় কনফিগ সংরক্ষণ করো"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3879,17 +3873,17 @@ msgstr ""
 "এই উইজার্ড আপনাকে আপনার সার্ভারের সময় একটি বহিস্থিত টাইম সার্ভারের সাথে সামঞ্জস্য "
 "রেখে নির্ধারণ করতে সাহায্য করবে।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "সুতরাং আপনার সার্ভার আপনার নেটওয়ার্কের স্থানীয় টাইম-সার্ভার হিসাবে ব্যবহৃত হবে।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "পরবর্তী-ধাপ ক্লিক করে আরম্ভ করুন, অথবা বাতিল ক্লিক করে উইজার্ড থেকে প্রস্থান করুন"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3897,35 +3891,35 @@ msgstr ""
 "(আমরা দুবারই pool.ntp.org সার্ভার ব্যবহার করতে সুপারিশ করছি যেহেতু এই সার্ভার "
 "অনিয়মিতভাবে উপস্থিত টাইম সার্ভারকে নির্দেশ করে)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "একটি প্রাথমিক এবং দ্বিতীয় সার্ভার তালিকাথেকে নির্বাচন করুন।"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "টাইম সার্ভার"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "প্রাথমিক টাইম সার্ভার:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "দ্বিতীয় টাইম সার্ভার:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "একটি সময়ের ক্ষেত্র নির্বাচন করুন"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "একটি অঙ্চল নির্বাচন করুন:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "একটি শহর নির্বাচন করুন:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3933,35 +3927,35 @@ msgstr ""
 "যদি টাইম সার্ভার তত্‍‌ক্ষণাত উপস্থিত না হয় (নেটওয়ার্ক অথবা অন্য কারণে) তাহলে আনুমানিক "
 "৩০ সেকেন্ডের বিলম্ব হবে।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "টাইম সার্ভার সংক্রান্ত পরীক্ষা আরম্ভ করবার জন্য পরবর্তী-ধাপ ক্লিক করুন।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "টাইম সার্ভার উপস্থিত আছে কি না, তা পরীক্ষা করা হচ্ছে"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "সময়ের ক্ষেত্র:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "টাইম সার্ভারগুলো উত্তর দিচ্ছে না। সম্ভবত কারণ:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- অনুপস্থিত টাইম সার্ভার"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- কোনো বাইরের নেটওয়ার্ক নয়"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- অন্যান্য কারণ..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3969,11 +3963,11 @@ msgstr ""
 "- আপনি টাইম সার্ভারের সাথে পুনরায় সংযোগ করবার চেষ্টা করতে পারেন, অথবা সময় "
 "নির্ধারণ না করে কনফিগারেশন সংরক্ষণ করতে পারেন।"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "টাইম সার্ভার কনফিগারেশন উইজার্ড"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "আপনার সার্ভারকে এখন স্থানীয় নেটওয়ার্কের টাইম-সার্ভার হিসাবে ব্যবহার করা যাবে।"
@@ -4015,15 +4009,15 @@ msgstr ""
 "আপনার সার্ভার-কে আপনার অভ্যন্তরীণ নেটওয়ার্ক (ইন্ট্রানেট)-এ এবং ইন্টারনেট-এ ওয়েব "
 "সার্ভার হিসাবে ব্যবহার করা যাবে। "
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "ওয়েব সার্ভার-কে  ইনট্রানেটের জন্য সক্রিয় করো"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "ওয়েব সার্ভার-কে  ইন্টারনেটের জন্য সক্রিয় করো"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4033,11 +4027,11 @@ msgstr ""
 "ব্যবহারকারীদের নিজেদের হোমের একটি ডিরেক্টরি আপনার http সার্ভারে ব্যবহার করবার "
 "সুযোগ প্রদান করে, ঐ ডিরেক্টরির নাম আপনাকে পরে জিজ্ঞাসা করা হবে।"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "মডিউল :"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4046,7 +4040,7 @@ msgstr ""
 "http://www.yourserver.com/~user -এর মাধ্যমে ব্যবহারকারীদের নিজেদের \n"
 "হোমের একটি ডিরেক্টরি আপনার http সার্ভারে ব্যবহার করবার সুযোগ প্রদান করে।"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4054,28 +4048,28 @@ msgstr ""
 "http://www.yourserver.com/~user -এর মাধ্যমে ব্যবহারকারীরা নিজেদের হোমে যে "
 "ডিরেক্টরিটি তৈরি পেতে ইচ্ছুক তার নাম (~/ ছাড়া) টাইপ করুন"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "আপনাকে অবশ্যই প্রথমে একটি Ldap সার্ভার সেটআপ করতে হবে।"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "user http sub-directory: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "ডকুমেন্ট রুট হিসাবে আপনি যে ডিরেক্টরিটি ব্যবহার করতে ইচ্ছুক তার পাথ লিখুন।"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "ডকুমেন্ট রুট:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "ওয়েব সার্ভার কনফিগার করবার প্রক্রিয়া"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4083,31 +4077,43 @@ msgstr ""
 "আপনার ওয়েব সার্ভার কনফিগার করবার জন্য নিম্নলিখিত প্রয়োজনীয় প্যারামিটার উইজার্ড "
 "সংগ্রহ করেছে"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "ইনট্রানেট ওয়েব সার্ভার:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "ইন্টারনেট ওয়েব সার্ভার:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "ব্যবহারকারীর ডিরেক্টরি:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "উইজার্ড আপনার ইনট্রানেট/ইন্টারনেট ওয়েব সার্ভারকে সাফল্যের সাথে কনফিগার করেছে"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "অ্যাপাচে সার্ভার"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "আপনার সিস্টেমকে অ্যাপাচে সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "কমান্ডটি এখনো চলছে। আপনি কি এটিকে kill করে উইজার্ড থেকে বের হয়ে যেতে চান?"
+
+#~ msgid "Close"
+#~ msgstr "বন্ধ"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "স্লেভ DNS সার্ভার"
+
 #~ msgid "Mail domain:"
 #~ msgstr "মেইল ডোমেইন:"
 
diff --git a/po/br.po b/po/br.po
index 474dc5f5..336e0800 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-2.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-03-30 10:11+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: breton <LL@li.org>\n"
@@ -20,8 +20,8 @@ msgstr ""
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Ho evezh."
 
@@ -33,17 +33,17 @@ msgstr "Fazi."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gourc'hemennoù"
 
@@ -111,42 +111,42 @@ msgid "Warning"
 msgstr "Ho evezh"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fazi"
 
@@ -199,15 +199,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Serriñ"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr ""
@@ -286,8 +277,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "diweredekaet"
 
@@ -295,8 +286,8 @@ msgstr "diweredekaet"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "bev"
 
@@ -314,13 +305,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Sac'het"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -610,19 +601,24 @@ msgstr "Servijer ar keleier"
 msgid "NFS server"
 msgstr "Servijer NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servijer Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servijer FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -631,7 +627,7 @@ msgstr ""
 "N'eo ket staliadet %s\n"
 "Klikit ouzh « A heul » evit staliañ pe ouzh « Nullañ » evit guitaat"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Staliañ a zo sac'het"
 
@@ -885,11 +881,6 @@ msgstr ""
 msgid "Master kolab server"
 msgstr "Servijer DNS mestr"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Servijer Kolab"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -914,22 +905,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Servijer DNS mestr"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Servijer Postfix"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Servijer Kolab"
@@ -1003,7 +994,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1036,19 +1030,19 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servijer Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Skoazeller Ldap"
@@ -1377,7 +1371,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Renkell :"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -1963,7 +1957,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3505,111 +3499,111 @@ msgstr "Servijer Postfix"
 msgid "OpenSSH server"
 msgstr "Servijer Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Skoazeller an eur"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servijerioù an eur"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Dibabit ur takad-eur"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Dibabit ur rannvro :"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Dibabit ur ger :"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Takad-eur :"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3648,87 +3642,94 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servijer Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid "Close"
+#~ msgstr "Serriñ"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Servijer Kolab"
+
 #, fuzzy
 #~ msgid "create mask"
 #~ msgstr "Maskl rouedad:"
diff --git a/po/bs.po b/po/bs.po
index 049e34c6..52e20708 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-26 11:25+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -24,8 +24,8 @@ msgstr "čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Upozorenje."
 
@@ -37,17 +37,17 @@ msgstr "Greška."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Čestitam"
 
@@ -125,42 +125,42 @@ msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Nalazite se u dhcp-u, server možda neće raditi sa ovom konfiguracijom."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Greška"
 
@@ -223,15 +223,6 @@ msgstr ""
 "biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. Pokrenite "
 "drakconnet kako bi prilagodili ime."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Naredba se izvršava. Da li je želite prekinuti i izaći iz Čarobnjaka?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zatvori"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak"
@@ -320,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "isključen"
 
@@ -329,8 +320,8 @@ msgstr "isključen"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "uključen"
 
@@ -348,13 +339,13 @@ msgstr "Čarobnjak je uspješno podesio DHCP servise."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Neuspjeh"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ponovo pokrenite drakwizard i pokušajte promijeniti neke parametre."
 
@@ -672,19 +663,24 @@ msgstr "News server"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard odabir čarobnjaka"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Molim odaberite čarobnjaka"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -693,7 +689,7 @@ msgstr ""
 "%s nije instaliran\n"
 "Kliknite na \"Sljedeći\" da ga instalirate ili \"Odustani\" za izlaz"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "instalacija nije uspjela"
 
@@ -981,11 +977,6 @@ msgstr "Čarobnjak za podešavanje Kolab servera"
 msgid "Master kolab server"
 msgstr "Glavni DNS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Pomoćni DNS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1017,22 +1008,22 @@ msgstr "Dobrodošli u čarobnjak za podešavanje Kolab groupware servera"
 msgid "Master or slave Kolab server"
 msgstr "Glavni DNS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Već ste uspješno podesili vaš LDAP server"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Pomoćni DNS server"
@@ -1108,7 +1099,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1142,21 +1136,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab server je sada podešen i pokrenut. Prijavite se kao korisnik 'manager' "
 "sa šifrom koju ste odredili na https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavam Kolab server na vašem sistemu..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP čarobnjak"
@@ -1506,7 +1501,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorij:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Put koji ste unijeli ne postoji."
 
@@ -2161,7 +2156,7 @@ msgstr ""
 "proxy-ja:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3819,19 +3814,19 @@ msgstr "Podešavam vaš Samba server..."
 msgid "OpenSSH server"
 msgstr "Apache server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Time čarobnjak"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Pokušaj ponovo"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Sačuvaj postavke bez testa"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3839,15 +3834,15 @@ msgstr ""
 "Ovaj čarobnjak će vam pomoći da podesite vrijeme na vašem serveru, ili "
 "lokalno ili sinhronizirano sa vanjskim time serverom."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Dakle vaš server će biti lokalni time server za vašu mrežu."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "pritisnite Dalje za početak, ili Odustani da napustite ovaj čarobnjak"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3855,35 +3850,35 @@ msgstr ""
 "(preporučujemo korištenje servera pool.ntp.org dva puta pošto ovaj server "
 "nasumično upućuje na aktivne servere)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Izaberite primarni i sekundarni server sa liste."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Time serveri"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primarni time server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundarni Time server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Izaberite vremensku zonu"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Izaberite regiju:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Izaberite grad:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3891,35 +3886,35 @@ msgstr ""
 "Ako time server nije trenutno dostupan (mreža ili neki drugi razlog), "
 "sačekaćete nekih 30 sekundi."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Pritisnite Dalje da pokrenete test time servera."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testiram dostupnost time servera"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Vremenska zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Time serveri ne odgovaraju. Razlozi mogu biti:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- nepostojeći time serveri"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nema vanjske mreže"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- ostali razlozi..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3927,11 +3922,11 @@ msgstr ""
 "- Možete ponovo pokušati kontaktirati time servere, ili sačuvati postavke "
 "bez podešavanja vremena."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfiguracija time servera sačuvana"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Vaš server se sada može ponašati kao time server za vašu lokalnu mrežu."
@@ -3973,15 +3968,15 @@ msgstr ""
 "Vaš server može raditi kao Web server prema vašoj internoj mreži (intranet) "
 "ili kao Web server za Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Uključi Web server za Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Uključi Web server za Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3991,11 +3986,11 @@ msgstr ""
 "home direktorijima koji je dostupan na vašem web serveru na adresi http://"
 "www.vašserver.com/~korisnik. Naziv ovog direktorija ćete odrediti kasnije."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduli:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4005,7 +4000,7 @@ msgstr ""
 "direktorijima koji je dostupan na vašem web serveru na adresi http://www."
 "vašserver.ba/~korisnik."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4014,29 +4009,29 @@ msgstr ""
 "direktorijima (bez ~/) kako bi bio dostupan kao http://www.vašserver.com/"
 "~korisnik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Morate najprije podesiti LDAP server."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "korisnički HTTP poddirektorij: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Unesite put do direktorija kojeg želite da budete korijen za dokumente."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Korijen dokumenata:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Podešavanje Web servera"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4044,30 +4039,42 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje Web "
 "servera"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet web server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet web server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Korisnički direktorij:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet Web server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje sistema kao Apache servera..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Naredba se izvršava. Da li je želite prekinuti i izaći iz Čarobnjaka?"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Pomoćni DNS server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Domena za mail:"
 
diff --git a/po/ca.po b/po/ca.po
index acd8ab23..e7461a77 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-07-04 17:57+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -25,8 +25,8 @@ msgstr "Auxiliar de configuració"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Avís."
 
@@ -38,17 +38,17 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Felicitats"
 
@@ -125,44 +125,44 @@ msgid "Warning"
 msgstr "Avís"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Esteu sobre dhcp; és possible que el servidor no funcioni amb aquesta "
 "configuració."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Error"
 
@@ -226,16 +226,6 @@ msgstr ""
 "ser El nom de màquina ha de ser un nom de domini completament qualificat "
 "(FQDN) Executeu drakconnect per ajustar-lo."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"La comanda encara s'està executant. Voleu matar-la i sortir de l'assistent?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Tanca"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Auxiliar del DHCP"
@@ -323,8 +313,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "inhabilitat"
 
@@ -332,8 +322,8 @@ msgstr "inhabilitat"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "habilitat"
 
@@ -351,13 +341,13 @@ msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Ha fallat"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Tornar a llançar drakwizard i intenta canviar alguns paràmetres."
 
@@ -664,19 +654,24 @@ msgstr "Servidor de notícies"
 msgid "NFS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servidor Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selecció d'auxiliar Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Seleccioneu un auxiliar"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -685,7 +680,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:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
@@ -964,11 +959,6 @@ msgstr "Auxiliar de configuració de Kolab"
 msgid "Master kolab server"
 msgstr "Servidor DNS mestre"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Servidor DNS esclau"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -993,22 +983,22 @@ msgstr "Benvingut a l'auxiliar de configuració del servidor Kolab Groupware"
 msgid "Master or slave Kolab server"
 msgstr "Servidor DNS mestre"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Ja heu configurat el vostre servidor Ldap"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Servidor DNS esclau"
@@ -1083,7 +1073,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1117,21 +1110,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "El servidor kolab està configurat i en execució. Entreu com a 'manager' amb "
 "la contrasenya que heu introduït a https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "S'està configurant el servidor Kolab al vostre sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servidor Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Auxiliar del Ldap"
@@ -1478,7 +1472,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "La ruta que heu entrat no existeix."
 
@@ -2118,7 +2112,7 @@ msgstr ""
 "servidor intermediari:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3714,19 +3708,19 @@ msgstr "S'està configurant el vostre servidor OpenSSH..."
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Auxiliar horari"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Torneu-ho a provar"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Desa la configuració sense comprovar-ho"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3734,16 +3728,16 @@ msgstr ""
 "Aquest auxiliar us ajudarà a establir l'hora del vostre servidor "
 "sincronitzant-lo amb un servidor horari extern."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Així, el vostre servidor serà el servidor horari local per a la vostra xarxa."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "premeu Següent per començar, o Cancel·la per sortir de l'auxiliar"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3751,35 +3745,35 @@ msgstr ""
 "(recomanem usar el servidor pool.ntp.org dos cops ja que aquest servidor "
 "apunta aleatòriament als servidors horaris disponibles)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Seleccioneu un servidor primari i un de secundari de la llista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servidors horaris"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Servidor horari primari:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Servidor horari secundari:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Trieu un fus horari"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Trieu una regió:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Trieu un país:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3787,35 +3781,35 @@ msgstr ""
 "Si el servidor horari no està disponible immediatament (per la xarxa o "
 "qualsevol altre motiu), haureu d'esperar uns 30 segons."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Premeu Següent per començar el test de servidors horaris."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "S'està comprovant la disponibilitat dels servidors horaris"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Fus horari:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Els servidors horaris no responen. Les causes possibles són:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- els servidors horaris no existeixen"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- cap xarxa exterior"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- altres motius..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3823,11 +3817,11 @@ msgstr ""
 "- Podeu intentar de nou contactar amb els servidors horaris, o desar la "
 "configuració sense realment configurar l'hora."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "S'ha desat la configuració del servidor horari"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "El vostre servidor ja pot funcionar com a un servidor horari per a la xarxa "
@@ -3872,15 +3866,15 @@ msgstr ""
 "El servidor pot fer de servidor Web per a la xarxa interna (intranet) i per "
 "a Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Habilita el servidor Web per a la Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Habilita el servidor Web per a internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3890,11 +3884,11 @@ msgstr ""
 "directori d'inici disponible a través del servidor http a http://www."
 "elteuservidor.com/~usuari, se us demanarà el nom del directori més tard."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Mòduls:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3902,7 +3896,7 @@ msgstr ""
 "Permet que els usuaris tinguin un directori en el seu directori d'inici "
 "disponible a través del servidor http a http://www.elteuservidor.com/~usuari."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3911,29 +3905,29 @@ msgstr ""
 "directori d'inici (sense el ~/) per que es pugui accedir a través de http://"
 "www.elteuservidor.com/~usuari"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Abans heu de configurar un servidor Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "subdirectori http d'usuari: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Escriviu la ruta del directori que voleu que sigui l'arrel dels documents."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Arrel dels documents:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "S'està configurant el servidor Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3941,31 +3935,44 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servidor Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Servidor Web per intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Servidor Web per internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Directori d'usuari:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'auxiliar ha configurat el servidor Web per a Intranet/Internet amb èxit"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servidor Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "S'està configurant el vostre sistema con servidor Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "La comanda encara s'està executant. Voleu matar-la i sortir de "
+#~ "l'assistent?"
+
+#~ msgid "Close"
+#~ msgstr "Tanca"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Servidor DNS esclau"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Domini de correu:"
 
diff --git a/po/cs.po b/po/cs.po
index a827da06..c09269c7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-11 23:50+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -31,8 +31,8 @@ msgstr "průvodce nastavením"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Varování."
 
@@ -44,17 +44,17 @@ msgstr "Chyba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
@@ -134,43 +134,43 @@ msgid "Warning"
 msgstr "Varování"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Chyba"
 
@@ -232,15 +232,6 @@ msgstr ""
 "název domény, neprázdný a jiný než localdomain. Název počítače musí být plně "
 "kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a upravte jej."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Příkaz stále běží. Chcete jej ukončit a opustit tohoto průvodce?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zavřít"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Průvodce pro DHCP"
@@ -329,8 +320,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "vypnuto"
 
@@ -338,8 +329,8 @@ msgstr "vypnuto"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "zapnuto"
 
@@ -357,13 +348,13 @@ msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Selhání"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Spusťte aplikaci drakwizard znovu a zkuste změnit některé parametry."
 
@@ -679,19 +670,24 @@ msgstr "Server diskusních skupin"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Výběr průvodců"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Vyberte si prosím průvodce"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -700,7 +696,7 @@ msgstr ""
 "%s není nainstalován.\n"
 "Nainstalujte stiskem tlačítka \"Další\" nebo skončete tlačítkem \"Zrušit\""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
@@ -977,11 +973,6 @@ msgstr "Průvodce nastavením serveru Kolab"
 msgid "Master kolab server"
 msgstr "Nadřízený DNS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Podřízený DNS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1013,22 +1004,22 @@ msgstr "Vítejte v průvodci nastavením groupware serveru Kolab."
 msgid "Master or slave Kolab server"
 msgstr "Nadřízený DNS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Váš server LDAP byl již nastaven"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Podřízený DNS server"
@@ -1103,7 +1094,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1137,21 +1131,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Server Kolab je nyní nastaven a běží. Přihlaste se jako 'manager' s heslem, "
 "které jste zadali, na adrese https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavuje se server Kolab na vašem systému..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Průvodce pro server LDAP"
@@ -1501,7 +1496,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Adresář:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Vámi zadaná cesta neexistuje."
 
@@ -2160,7 +2155,7 @@ msgstr ""
 "proxy serveru:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3878,19 +3873,19 @@ msgstr "Nastavuji váš server OpenSSH..."
 msgid "OpenSSH server"
 msgstr "OpenSSH server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Průvodce pro čas"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Zkusit opět"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Uložit nastavení bez testu"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3898,17 +3893,17 @@ msgstr ""
 "Tento průvodce vám pomůže nastavit čas na vašem serveru synchronizovaný s "
 "externím časovým serverem."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Tento průvodce vám pomůže nastavit časový server pro vaši síť."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Začněte klepnutím na tlačítko Další, nebo průvodce ukončete klepnutím na "
 "tlačítko Zrušit"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3916,35 +3911,35 @@ msgstr ""
 "(doporučujeme použít dvakrát server pool.ntp.org, jelikož tento server "
 "náhodně ukazuje na dostupné časové servery)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Vyberte ze seznamu primární a sekundární server."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Časové servery"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primární časový server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundární časový server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Vyberte časové pásmo"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Vyberte oblast:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Vyberte zemi:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3952,35 +3947,35 @@ msgstr ""
 "Pokud není časový server okamžitě dostupný (kvůli problémům se sítí), můžete "
 "čekat tak 30 sekund."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Klepněte na Další pro spuštění testu časových serverů."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testování dostupnosti časových serverů"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Časové pásmo:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Časový server neodpovídá. Příčinou může být:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr " - neexistující časové servery"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr " - není dostupná vnější síť"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr " - další důvody..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3988,11 +3983,11 @@ msgstr ""
 "- Můžete se opět pokusit kontaktovat časové servery nebo uložit nastavení "
 "bez nastavení aktuálního času."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Nastavení časového serveru uloženo"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Server nyní může fungovat jako časový server pro vaši lokální síť."
 
@@ -4034,15 +4029,15 @@ msgstr ""
 "Váš server může plnit funkci webového serveru pro vaši interní síť "
 "(Intranet) a webového serveru pro Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Povolit webový server pro Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Povolit webový server pro Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4052,11 +4047,11 @@ msgstr ""
 "adresář dostupný pomocí http serveru jako http://www.vasserver.com/"
 "~uzivatel, na název adresáře budete dotázáni dále."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduly:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4064,7 +4059,7 @@ msgstr ""
 "Umožní uživatelům zřídit si ve svém domovském adresáři adresář dostupný jako "
 "http://www.vasserver.cz/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4073,28 +4068,28 @@ msgstr ""
 "domovském adresáři (bez ~/), chtějí-li jej mít k dispozici na http://www."
 "yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Musíte zadat místní název internetové domény."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Uživatelský podadresář HTTP: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Zadejte název adresáře, který chcete mít jako kořenový pro dokumenty."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Kořen dokumentů:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Nastavuji webový server"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4102,30 +4097,41 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vašeho "
 "webového serveru"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Webový server pro Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Webový server pro Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Uživatelský adresář:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Průvodce úspěšně nastavil váš webový server pro Internet/Intranet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Server Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavuji váš systém jako server Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Příkaz stále běží. Chcete jej ukončit a opustit tohoto průvodce?"
+
+#~ msgid "Close"
+#~ msgstr "Zavřít"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Podřízený DNS server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Poštovní doména:"
 
diff --git a/po/cy.po b/po/cy.po
index f0df4720..42109337 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard-cy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-05 18:57-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -21,8 +21,8 @@ msgstr "dewin ffurfweddu"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Rhybudd."
 
@@ -34,17 +34,17 @@ msgstr "Gwall."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
@@ -122,43 +122,43 @@ msgid "Warning"
 msgstr "Rhybudd"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Gwall"
 
@@ -221,15 +221,6 @@ msgstr ""
 "gweinydd DNS, nid cydradd i barth lleol na dim. Rhaid i enw parth fod yn "
 "FQDN: Fully Qualified Domain Name. Cychwynnwch drakconnect i'w newid."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Mae'r gorchymyn yn dal i redeg. Hoffech chi ei ladd a chau'r Dewin?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Cau"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Dewin DHCP"
@@ -318,8 +309,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "anablwyd"
 
@@ -327,8 +318,8 @@ msgstr "anablwyd"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "galluogwyd"
 
@@ -346,13 +337,13 @@ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Methwyd"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
 
@@ -668,19 +659,24 @@ msgstr "Gweinydd newyddion"
 msgid "NFS server"
 msgstr "Gweinydd NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Gweinydd Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Dewis dewin Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Dewiswch ddewin"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -689,7 +685,7 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
@@ -981,11 +977,6 @@ msgstr "Dewin Ffurfweddu Kolab"
 msgid "Master kolab server"
 msgstr "Prif weinydd DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Is weinydd DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1017,22 +1008,22 @@ msgstr "Croeso i Ddewin ffurfweddu gweinydd Kolab Groupware"
 msgid "Master or slave Kolab server"
 msgstr "Prif weinydd DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Rydych eisoes wedi ffurfweddu eich gweinydd LDAP."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Is weinydd DNS"
@@ -1107,7 +1098,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1141,21 +1135,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Mae'r gweinydd kolab wedi ei ffurfweddu ac yn rhedeg. Mewngofnodwch fel "
 "'rheolwr' gyda'r cyfrinair rhoesoch yn https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Gweinydd Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Dewin Ldap"
@@ -1508,7 +1503,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Nid yw'r llwybr hwn yn bod."
 
@@ -2165,7 +2160,7 @@ msgstr ""
 "ffurfweddu eich dirprwy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3814,19 +3809,19 @@ msgstr "Ffurfweddu eich gweinydd Samba..."
 msgid "OpenSSH server"
 msgstr "Gweinydd gwe Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Dewin amser"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Ceisiwch eto"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Cadw'r ffurfweddiad heb brawf"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3834,15 +3829,15 @@ msgstr ""
 "Dewin i'ch cynorthwyo i osod amser eich gweinydd neu gydamseru gyda gweinydd "
 "amser allanol."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Felly bydd eich gweinydd yn weinydd amser lleol eich rhwydwaith."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "cliciwch Nesaf i gychwyn, neu Diddymu i adael y dewin"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3850,35 +3845,35 @@ msgstr ""
 "(rydym yn argymell eich bod yn defnyddio pool ntp.org ddwywaith gan i'r "
 "gweinydd gyfeirio at weinydd amser ar hap)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Dewiswch weinydd cynradd ac eilradd o'r rhestr."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Gweinyddion Amser"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Gweinydd Amser Cynradd:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Gweinyddion Amser Eilradd"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Dewis gylchfa amser"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Dewis ardal:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Cod Post/Tref"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3886,35 +3881,35 @@ msgstr ""
 "Os nad yw'r gweinydd amser ar gael yn syth (rhwydwaith neu reswm arall), "
 "bydd yna oedi am tua 30 eiliad."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Cliciwch Nesaf i gychwyn y prawf gweinyddion amser."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Profi presenoldeb y gweinyddion amser"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Cylchfa amser:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Nid yw'r gweinyddion amser yn ymateb. Gall hyn fod oherwydd:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- dim gweinyddion amser yn bod"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- dim rhwydwaith allanol"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- rhesymau eraill..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3922,11 +3917,11 @@ msgstr ""
 " - Gallwch geisio eto i gysylltu â'r gweinyddion amser, neu gadw'r "
 "ffurfweddiad heb osod yr amser."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Wedi cadw ffurfweddiad gweinydd amser"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Mae modd i'ch gweinydd weithredu fel gweinydd amser eich rhwydwaith lleol."
@@ -3969,15 +3964,15 @@ msgstr ""
 "Mae modd i'ch gweinydd weithredu fel Gweinydd Gwe ar gyfer eich rhwydwaith "
 "mewnol (mewnrwyd) ac fel Gweinydd Gwe ar gyfer y Rhyngrwyd."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Fewnrwyd"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Rhyngrwyd"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3987,11 +3982,11 @@ msgstr ""
 "cyfeiriadur cartref ar gael  ar eich gweinydd http drwy http://www.eich "
 "gweinydd.com/~defnyddiwr, cewch gais am enw'r cyfeiriadur wedyn"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modiwlau:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4000,7 +3995,7 @@ msgstr ""
 "Caniatáu i ddefnyddwyr gael cyfeiriadur yn eu cyfeiriadur cartref \n"
 "ar gael  ar eich gweinydd http drwy http://www.eichgweinydd.com/~defnyddiwr."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4008,28 +4003,28 @@ msgstr ""
 "Teipio enw'r cyfeiriadur y dylai defnyddwyr greu yn eu cartrefi (whitout ~/) "
 "i'w gael yn barod drwy http://www.eich gweinydd.com/~defnyddiwr"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Rhaid gosod gweinydd LDAP yn gyntaf"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "is-gyfeiriadur defnyddiwr http: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Teipio llwybr y cyfeiriadur i gychwyn gwraidd y ddogfen"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Gwraidd dogfen:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Ffurfweddu'r Gweinydd Gwe"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4037,31 +4032,42 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gweinydd Gwe"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Gweinydd gwe mewnrwyd"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Gweinydd gwe rhyngrwyd:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Cyfeiriadur defnyddiwr:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd Gwe Mewnrwyd/Rhyngrwyd"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Gweinydd gwe Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Mae'r gorchymyn yn dal i redeg. Hoffech chi ei ladd a chau'r Dewin?"
+
+#~ msgid "Close"
+#~ msgstr "Cau"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Is weinydd DNS"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Parth E-bost:"
 
diff --git a/po/da.po b/po/da.po
index 29a6d820..24e10104 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-05 22:24+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -28,8 +28,8 @@ msgstr "Konfigurationshjælper"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Advarsel."
 
@@ -41,17 +41,17 @@ msgstr "Fejl."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Tillykke"
 
@@ -128,42 +128,42 @@ msgid "Warning"
 msgstr "Advarsel"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fejl"
 
@@ -225,16 +225,6 @@ msgstr ""
 "domænenavn, ikke det samme som localdomain eller ingenting. Værtsnavnet skal "
 "være et fuldstændigt domænenavn. Kør drakconnect for at justere det."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Denne kommando kører stadigvæk. Vil du dræbe den og afslutte hjælperen?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Luk"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP-hjælper"
@@ -324,8 +314,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "deaktiveret"
 
@@ -333,8 +323,8 @@ msgstr "deaktiveret"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aktiveret"
 
@@ -352,13 +342,13 @@ msgstr "Hjælperen konfigurerede DHCP-tjenesterne uden problemer."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Mislykkedes"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Genstart drakwizard, og prøv at ændre nogen parametre."
 
@@ -680,19 +670,24 @@ msgstr "Nyhedsgruppeserver"
 msgid "NFS server"
 msgstr "NFS-server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard hjælpervalg"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Venligst vælg en hjælper"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -701,7 +696,7 @@ msgstr ""
 "%s er ikke installeret\n"
 "Klik \"Næste\" for at installere eller \"Annullér\" for at afslutte"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installation mislykkedes"
 
@@ -989,11 +984,6 @@ msgstr "Konfigurationshjælper for Kolab"
 msgid "Master kolab server"
 msgstr "Master DNS-server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Slave DNS-server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1026,22 +1016,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Master DNS-server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Du har allerede konfigureret din Ldap-server"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Slave DNS-server"
@@ -1117,7 +1107,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1151,21 +1144,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab-serveren er nu konfigureret og kører. Logind som 'manager', med den "
 "adgangskode du indtastede. på https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-server på dit system..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap-hjælper"
@@ -1517,7 +1511,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Stien du indtastede eksisterer ikke."
 
@@ -2175,7 +2169,7 @@ msgstr ""
 "proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3833,19 +3827,19 @@ msgstr "Konfigurerer din Samba-server..."
 msgid "OpenSSH server"
 msgstr "Apache-server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tidshjælper"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Forsøg igen"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "gem konfiguration uden test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3853,16 +3847,16 @@ msgstr ""
 "Denne hjælper kan hjælpe dig med at sætte tiden på din server synkroniseret "
 "med en ekstern tidsserver."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Således vil din server være den lokale tidsserver for dit netværk."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Klik på Næste for at begynde eller Afbryd for at afslutte denne hjælper."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3870,35 +3864,35 @@ msgstr ""
 "(vi anbefaler at du bruger serveren pool.ntp.org to gange, da denne server "
 "tilfældigt peger på tilgængelige tidsservere)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Vælg en primær og en sekundær server fra listen."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tidsservere"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primær tidsserver:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundær tidsserver:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Vælg en tidszone"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Vælg en region:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Vælg et land:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3906,35 +3900,35 @@ msgstr ""
 "Hvis tidsserveren ikke er umiddelbart tilgængelig (pga. netværket eller "
 "andre årsager), vil der være en forsinkelse på omkring 30 sekunder."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Klik på Næste for at starte testet af tidsserverne."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Afprøver tilgængeligheden af tidsserverne"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Tidszone:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Tidsserverne svarer ikke. Årsagerne kan være:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ikke-eksisterene tidsservere"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- intet ydre netværk"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- andre årsager..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3942,11 +3936,11 @@ msgstr ""
 "- Du kan prøve at kontakte tidsservere igen, eller gemme konfigurationen "
 "uden faktisk at sætte tiden."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfiguration af tidsserver gemt"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Din server kan nu agere som en tidsserver for dit lokale netværk."
 
@@ -3988,15 +3982,15 @@ msgstr ""
 "Din server kan opføre sig som en web-server mod dit interne netværk "
 "(intranet) og som en web-server for Internettet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Aktivér web-serveren for Intranettet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Aktivér web-serveren for Internettet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4006,11 +4000,11 @@ msgstr ""
 "tilgængeligt på din http-server via http://www.din-server.dk/~bruger, du vil "
 "blive spurgt om navnet på dette katalog bagefter."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduler:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4019,7 +4013,7 @@ msgstr ""
 "Tillader brugere at få et katalog i deres hjemmekatalog \n"
 "tilgængeligt på din http-server via http://www.din-server.dk/~bruger."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4027,28 +4021,28 @@ msgstr ""
 "Indtast navnet på det katalog, brugere bør oprette i deres hjemmekatalog "
 "(uden ~/) for at få det tilgængeligt via http://www.din-server.dk/~bruger"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Du skal først opsætte en Ldap-server."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "brugers http-underkatalog: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Indtast stien på kataloget du ønsker skal være dokumentroden."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumentrod:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigurerer webserveren"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4056,31 +4050,43 @@ msgstr ""
 "Hjælperen samlede følgende parametre som behøves for at konfigurere din web-"
 "server"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet-webserver:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet-webserver:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Brugerkatalog:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Hjælperen konfigurerede din Intranet/Internet web-server uden problemer"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache-server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer dit system som en Apache-server ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Denne kommando kører stadigvæk. Vil du dræbe den og afslutte hjælperen?"
+
+#~ msgid "Close"
+#~ msgstr "Luk"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Slave DNS-server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Epost-domæne:"
 
diff --git a/po/de.po b/po/de.po
index fa40f310..5d25b9b1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-02 20:59+0200\n"
 "Last-Translator: Frank Koester <frank@dueppel13.de>\n"
 "Language-Team: deutsch\n"
@@ -35,8 +35,8 @@ msgstr "Konfigurations-Assistent"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Warnung."
 
@@ -48,17 +48,17 @@ msgstr "Fehler."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch"
 
@@ -139,44 +139,44 @@ msgid "Warning"
 msgstr "Warnung"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Sie befinden sich im DHCP-Modus, der Server wird eventuell nicht erreichbar "
 "sein."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fehler"
 
@@ -243,17 +243,6 @@ msgstr ""
 "muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie drakconnect "
 "zur Anpassung."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Der Befehl wird noch ausgeführt. Wollen Sie Ihn abbrechen und den "
-"Assistenten beenden?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Schließen"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP-Assistent"
@@ -344,8 +333,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "aus"
 
@@ -353,8 +342,8 @@ msgstr "aus"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "ein"
 
@@ -372,13 +361,13 @@ msgstr "Der Assistent hat die DHCP-Dienste erfolgreich eingerichtet."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Fehler"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Starten Sie Drakwizard erneut, und versuchen Sie, einige Parameter zu ändern."
@@ -701,19 +690,24 @@ msgstr "News-Server"
 msgid "NFS server"
 msgstr "NFS-Server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-Server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-Server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "DrakWizard Assistenten Auswahl"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Bitte wählen Sie einen Assistenten"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -722,7 +716,7 @@ msgstr ""
 "%s ist nicht installiert\n"
 "Wählen Sie „Weiter“ für die Installation, oder „Abbrechen“ zum Beenden"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installation fehlgeschlagen"
 
@@ -1006,11 +1000,6 @@ msgstr "Kolab Konfigurations-Assistent"
 msgid "Master kolab server"
 msgstr "Master-DNS-Server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Slave-DNS-Server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1042,22 +1031,22 @@ msgstr "Willkommen zum Kolab Groupware-Server Konfigurations-Assistenten."
 msgid "Master or slave Kolab server"
 msgstr "Master-DNS-Server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Sie haben Ihren LDAP-Server schon konfiguriert"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Slave-DNS-Server"
@@ -1135,7 +1124,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1170,22 +1162,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Der Kolab-Server ist nun eingerichtet und läuft. Loggen Sie sich als "
 "'manager'·ein mit dem eingegebenen Passwort unter:·https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguriere den Kolab-Server auf Ihrem System..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-Server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap-Assistent"
@@ -1538,7 +1531,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Das angegebene Verzeichnis existiert nicht."
 
@@ -2201,7 +2194,7 @@ msgstr ""
 "des Proxys braucht:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3881,19 +3874,19 @@ msgstr "Konfiguriere Ihren Samba-Server..."
 msgid "OpenSSH server"
 msgstr "Apache Server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Zeit-Synchronisations-Assistent"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Nochmal versuchen"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Konfiguration ohne Test speichern"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3901,17 +3894,17 @@ msgstr ""
 "Der Assistent wird Ihnen helfen, die Zeit Ihres Servers mit einem externen "
 "Zeit-Server zu synchronisieren."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Ihr Server wird der lokale Zeit-Server für Ihr Netzwerk sein."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "klicken Sie auf „Weiter“ um zu beginnen oder „Abbrechen“ um den Assistenten "
 "zu verlassen"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3919,36 +3912,36 @@ msgstr ""
 "(Wir empfehlen die zweifache Benutzung des Servers pool.ntp.org, da dieser "
 "Server zufällig auf verfügbare Zeitserver verweist)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 "Wählen Sie einen primären und einen sekundären Server von der Liste aus."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Zeit-Server"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primärer Zeit-Server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundärer Zeit-Server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Wählen Sie eine Zeitzone"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Wählen Sie eine Region:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Wählen Sie eine Land:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3956,35 +3949,35 @@ msgstr ""
 "Wenn die Zeit-Server nicht sofort verfügbar sind ( Netzwerk oder andere "
 "Gründe), wird es eine etwa 30 Sekunden lange Verzögerung geben."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Klicken Sie auf „Weiter“ um den Zeit-Server-Test zu starten."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Teste die Verfügbarkeit des Zeit-Servers"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zeitzone:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Die Zeit-Ssserver antworten nicht, der Gründe könnten sein:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- keine existierenden Zeit-Server"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- keine Verbindung ins Internet"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- Andere Gründe..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3992,11 +3985,11 @@ msgstr ""
 "Sie können nochmals versuchen die Zeit-Server zu kontaktieren oder die "
 "Konfiguration speichern ohne die Zeit einzustellen."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Zeit-Server-Konfiguration gespeichert"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Ihr Server kann jetzt der Zeit-Server für Ihr lokales Netzwerk sein."
 
@@ -4040,15 +4033,15 @@ msgstr ""
 "Ihr Server kann als ein Web-Server für Ihr internes Netz (Intranet) und für "
 "das Internet dienen."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Den Web-Server für das Intranet aktivieren"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Den Web-Server für das Internet aktivieren"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4059,11 +4052,11 @@ msgstr ""
 "com/~user' erreichbar ist. Sie werden später nach einem Namen für dieses "
 "Verzeichnis gefragt."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Module:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4073,7 +4066,7 @@ msgstr ""
 "haben, der auf dem HTTP-Server über 'http://www.yourserver.com/~user' "
 "erreichbar ist."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4082,29 +4075,29 @@ msgstr ""
 "Persönlichen Verzeichnis erstellen sollen (ohne ~/), um es über http://www."
 "yourserver.com/~user zu erreichen"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Sie müssen zuerst einen LDAP-Server aufsetzen."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Benutzer-HTTP-Unter-Verzeichnis: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Geben Sie den Pfad des Verzeichnisses an, das 'document root' werden soll."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document-Root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfiguriere den Web-Server"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4112,31 +4105,44 @@ msgstr ""
 "Der Assistent hat folgende Parameter gesammelt, die für die Konfiguration "
 "Ihres Web-Servers gebraucht werden"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet Web-Server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet Web-Server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Benutzer-Verzeichnis:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Der Assistent hat ihren Intranet/Internet Web-Server erfolgreich konfiguriert"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache Server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguriere Ihr System als Apache-Server..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Der Befehl wird noch ausgeführt. Wollen Sie Ihn abbrechen und den "
+#~ "Assistenten beenden?"
+
+#~ msgid "Close"
+#~ msgstr "Schließen"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Slave-DNS-Server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Mail-Domäne:"
 
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index e9248001..8a683a79 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -22,8 +22,8 @@ msgstr ""
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr ""
 
@@ -35,17 +35,17 @@ msgstr ""
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr ""
 
@@ -113,42 +113,42 @@ msgid "Warning"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr ""
 
@@ -201,15 +201,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr ""
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr ""
@@ -288,8 +279,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr ""
 
@@ -297,8 +288,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr ""
 
@@ -316,13 +307,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -608,26 +599,31 @@ msgstr ""
 msgid "NFS server"
 msgstr ""
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr ""
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr ""
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr ""
 
@@ -878,10 +874,6 @@ msgstr ""
 msgid "Master kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr ""
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -905,21 +897,21 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr ""
 
@@ -990,7 +982,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1023,17 +1018,17 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
-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/"
+msgid "Done"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Configuring Kolab server on your system..."
+#: ../kolab_wizard/Kolab.pm:219
+msgid ""
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
+msgid "Configuring Kolab server on your system..."
 msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:32
@@ -1361,7 +1356,7 @@ msgstr ""
 msgid "Directory:"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -1940,7 +1935,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3448,111 +3443,111 @@ msgstr ""
 msgid "OpenSSH server"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3591,83 +3586,83 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 2d54d6a9..19d93884 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -21,8 +21,8 @@ msgstr "Οδηγός Ρυθμίσεων"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Προειδοποίηση"
 
@@ -34,17 +34,17 @@ msgstr "Σφάλμα."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
@@ -123,43 +123,43 @@ msgid "Warning"
 msgstr "Προειδοποίηση"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -216,15 +216,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Κλείσιμο"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Οδηγός DHCP"
@@ -312,8 +303,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "απενεργοποιημένο"
 
@@ -321,8 +312,8 @@ msgstr "απενεργοποιημένο"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "ενεργοποιημένο"
 
@@ -340,13 +331,13 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσ
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Ανεπιτυχές"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Επανεκκίνηστε το drakwizard και προσπαθήστε να αλλάξετε κάποιες παραμέτρους"
@@ -650,19 +641,25 @@ msgstr "Εξυπηρετητής News "
 msgid "NFS server"
 msgstr "Εξυπηρετητής NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Εξυπηρετητής Samba"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Διακομιστής FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Επιλογή οδηγού Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Παρακαλώ επιλέξτε έναν οδηγό"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -671,7 +668,7 @@ msgstr ""
 "Το %s δεν είναι εγκατεστημένο επιλέξτε \"Επόμενο\" για εγκατάσταση η \"Άκυρο"
 "\" για έξοδο"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
@@ -947,11 +944,6 @@ msgstr "Οδηγός Ρυθμίσεων Samba"
 msgid "Master kolab server"
 msgstr "Κύριος διακομιστής DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Δευτερεύων διακομιστής DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -977,22 +969,22 @@ msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 msgid "Master or slave Kolab server"
 msgstr "Κύριος διακομιστής DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Samba."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Δευτερεύων διακομιστής DNS"
@@ -1068,7 +1060,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1103,21 +1098,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Εξυπηρετητής Samba"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Οδηγός Ldap"
@@ -1482,7 +1476,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Κατάλογος:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Η θέση που ορίσατε δεν υπάρχει."
 
@@ -2123,7 +2117,7 @@ msgstr ""
 "το proxy σας:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3748,19 +3742,19 @@ msgstr "Ρυθμίσεις εξυπηρετητή Samba ..."
 msgid "OpenSSH server"
 msgstr "Εξυπηρετητής Apache "
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Οδηγός Ώρας"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Προσπαθήστε ξανά"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Αποθήκευση ρυθμίσεων χωρίς δοκιμή"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3768,52 +3762,52 @@ msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει να ρυθμίσετε την ώρα του συστήματός σας, σε "
 "συγχρονισμό με έναν εξωτερικό εξυπηρετητή ώρας."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Επομένως ο εξυπηρετητής σας θα είναι ο τοπικός εξυπηρετητής ώρας για το "
 "δίκτυό σας."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Πατήστε επόμενο για να ξεκινήσετε, ή άκυρο για να βγείτε από τον οδηγό"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 "Επιλέξτε έναν πρωτεύοντα και ένα δευτερεύοντα εξυπηρετητή από τη λίστα."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Εξυπηρετητές Ώρας"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Πρωτεύων Εξυπηρετητή Ώρας:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Δευτερεύων Εξυπηρετητής Ώρας:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Επιλέξτε ζώνη ώρας"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Επιλέξτε Περιοχή"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Επιλέξτε πόλη"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3821,35 +3815,35 @@ msgstr ""
 "Αν ο εξυπηρετητής ώρας δεν είναι αμέσως διαθέσιμος (πρόβλημα δικτύου ή "
 "άλλο), θα περιμένετε περίπου 30 δεύτερα."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Πατήστε επόμενο για να ξεκινήσετε τη δοκιμή των εξυπηρετητών ώρας."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Δοκιμάζεται η διαθεσιμότητα των εξυπηρετητών ώρας"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Ζώνη ώρας:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Οι εξυπηρετητές ώρας δεν ανταποκρίνονται. Οι αιτίες μπορεί να είναι:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ανύπαρκτοι εξυπηρετητές ώρας"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr " - χωρίς εξωτερικό δίκτυο"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr " - άλλοι λόγοι..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3857,11 +3851,11 @@ msgstr ""
 "Μπορείτε να ξαναπροσπαθήσετε για να επικοινωνήσετε με τους εξυπηρετητές, ή "
 "να σώσετε τις ρυθμίσεις χωρίς να τροποποιηθεί η ώρα του συστήματος."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Αποθηκεύτηκε η ρύθμιση του Εξυπηρετητή Ώρας"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Ο διακομιστής σας μπορεί να λειτουργήσει ως εξυπηρετητή ώρας για το τοπικό "
@@ -3908,15 +3902,15 @@ msgstr ""
 "Ο διακομιστής σας μπορεί να λειτουργεί ως Διακομιστής Ιστού για το εσωτερικό "
 "σας δίκτυο (intranet) και ως διακομιστής Ιστού για το Διαδίκτυο."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Ενεργοποίηση του Διακομιστή Ιστού για το Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Ενεργοποίηση του Διακομιστή Ιστού για το Διαδίκτυο"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3926,11 +3920,11 @@ msgstr ""
 "τους κατάλογο που θα είναι διαθέσιμος μέσω του διακομιστή http ως http://www."
 "yourserver.com/~user,το ακριβές όνομά του θα σας ζητηθεί στη συνέχεια."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Αρθρώματα:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3940,7 +3934,7 @@ msgstr ""
 "θα είναι διαθέσιμος μέσω του διακομιστή http ως http://www.yourserver.com/"
 "~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3949,30 +3943,30 @@ msgstr ""
 "στον αρχικό τους κατάλογο (χωρίς το αρχικό ~/), για να γίνει αυτός "
 "διαθέσιμος ως http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Πρέπει να επιλέξτε πρώτα μια εικόνα!"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "υποκατάλογος χρήστη http: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Εισάγετε τη θέση του καταλόγου που θέλετε να γίνει ο αρχικός κατάλογος "
 "εγγράφων."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Αρχικός Κατάλογος Εγγράφων:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Ρύθμιση του Διακομιστή Ιστού"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3980,30 +3974,37 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "τον Διακομιστή Ιστού"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Διακομιστής ιστού Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Διακομιστής Ιστού Διαδικτύου:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Κατάλογος Χρήστη:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Ιστού Διαδικτύου/Intranet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Εξυπηρετητής Apache "
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Το σύστημα σας ρυθμίζεται σαν εξυπηρετητής Apache "
 
+#~ msgid "Close"
+#~ msgstr "Κλείσιμο"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Δευτερεύων διακομιστής DNS"
+
 #, fuzzy
 #~ msgid "Mail domain:"
 #~ msgstr "Τομέας NIS:"
diff --git a/po/eo.po b/po/eo.po
index 45dd17a1..cc24f32b 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -23,8 +23,8 @@ msgstr "Konfigurad-sorĉilo"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Averto"
@@ -37,17 +37,17 @@ msgstr "Eraro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulon"
 
@@ -126,44 +126,44 @@ msgid "Warning"
 msgstr "Averto"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Eraro"
 
@@ -220,15 +220,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Fermu"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP-sorĉilo"
@@ -319,8 +310,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "elŝaltita"
 
@@ -328,8 +319,8 @@ msgstr "elŝaltita"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "enŝaltita"
 
@@ -349,14 +340,14 @@ msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 #, fuzzy
 msgid "Failed"
 msgstr "enŝaltita"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -680,26 +671,31 @@ msgstr "Novaĵ-servilo"
 msgid "NFS server"
 msgstr "NFS-servilo"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-servilo"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-servilo"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-sorĉilo-elekto"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Bonvole elektu sorĉilon"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
@@ -966,11 +962,6 @@ msgstr "Sorĉilo por Kolab-konfigurado"
 msgid "Master kolab server"
 msgstr "NFS-servilo"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS-servilo"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -996,22 +987,22 @@ msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 msgid "Master or slave Kolab server"
 msgstr "NFS-servilo"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS-servilo"
@@ -1087,7 +1078,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1124,20 +1118,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-servilo"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap-sorĉilo"
@@ -1504,7 +1498,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Dosierujo:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "La pado, kiun vi enigis, ne ekzistas."
 
@@ -2140,7 +2134,7 @@ msgstr ""
 "prokuron:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3748,19 +3742,19 @@ msgstr "Mi konfiguras la FTP-servilon"
 msgid "OpenSSH server"
 msgstr "Intrareta teksaĵ-servilo:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tempo-sorĉilo"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Provu denove"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Konservu config sen testo"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3768,52 +3762,52 @@ msgstr ""
 "Tiu ĉi sorĉilo helpos vin agordi la tempon de via servilo sinkronigita kun "
 "ekstera tempo-servilo."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Tiel via servilo estos la servilo de loka tempo por via reto."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "premu SEKVA por komenci, aŭ nuligu por forlasi tiun ĉi sorĉilon"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Elektu primaran kaj sekundaran servilon de la listo."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tempo-serviloj"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primara tempo-servilo:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundara Tempo-servilo:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Elekti horzonon:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Elekti horzonon:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Elekti horzonon:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3821,35 +3815,35 @@ msgstr ""
 "Se la tempo-servilo ne estas tuj alirebla (retaj aŭ aliaj kaŭzoj), tiam esto "
 "prokrasto de proksimume 30 sekundoj."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Premu SEKVA por startigi la teston de tempo-serviloj."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Mi testas la alireblon de la tempo-serviloj"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Horzono:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "La tempo-serviloj ne resondas. La kialoj povas esti:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ne ekzistantaj tempo-serviloj"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- neniu ekstera reto"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- aliaj kaŭzoj..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3858,11 +3852,11 @@ msgstr ""
 "Vi povas denove provi kontakti temposervilojn, aŭ konservi la konfiguraĵon "
 "sen nun agordi la tempon."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfiguraĵo de tempo-servilo konservita"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Via servilo povas nun agi kiel tempo-servilo por via loka reto."
 
@@ -3903,15 +3897,15 @@ msgstr ""
 "Via servilo povas agi kiel Teksaĵ-servilo rilate al via interna reto "
 "(intrareto) kaj kiel Teksaĵ-servilo por la Interreto."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Enŝaltu la Teksaĵ-servilon por la Intrareto"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Enŝaltu la Teksaĵ-servilon por la Interreto"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3921,11 +3915,11 @@ msgstr ""
 "alireblan sur via http-servilo pere de http://www.viaservilo.com/~uzulo, vi "
 "estos demandita poste pri la nomo de tiu dosierujo."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduloj:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3935,7 +3929,7 @@ msgstr ""
 "alireblan sur via http-servilo pere de http://www.viaservilo.com/~uzulo, vi "
 "estos demandita poste pri la nomo de tiu dosierujo."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3943,29 +3937,29 @@ msgstr ""
 "Entajpu la nomon de la dosierujo kiun uzuloj kreu en siaj hejmoj (sen ~/) "
 "por alirebligi ĝin pere de http://www.viaservilo.com/~uzulo"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Datenbaz-servilo"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "user http sub-directory: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Entajpu la padon de la dosieruno kiun vi deziras esti la document root."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Mi konfiguras la Teksaĵ-servilon"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3973,33 +3967,40 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian Teksaĵ-"
 "servilon"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intrareta teksaĵ-servilo:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Interreta teksaĵ-servilo:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Uzul-dosierujo:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "La sorĉilo sukcese konfiguris vian intraretan/interretan Teksaĵ-servilon"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Intrareta teksaĵ-servilo:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurante la DNS-servilon"
 
+#~ msgid "Close"
+#~ msgstr "Fermu"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS-servilo"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "Uzul-dosierujo:"
diff --git a/po/es.po b/po/es.po
index 4977aaf8..019edac2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-21 23:07+0100\n"
 "Last-Translator: Jaime Crespo <505201@unizar.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -23,8 +23,8 @@ msgstr "Asistente de configuración"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Advertencia."
 
@@ -36,17 +36,17 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Felicidades"
 
@@ -124,43 +124,43 @@ msgid "Warning"
 msgstr "Advertencia"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Error"
 
@@ -223,16 +223,6 @@ msgstr ""
 "nombre de dominio correcto, distinto a 'localdomain' o vacío. Lance "
 "drakconnect para ajustarlo."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"El comando todavía está ejecutando ¿Desea finalizarlo y salir del Asistente?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Cerrar"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Asistente de DHCP"
@@ -323,8 +313,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "deshabilitado"
 
@@ -332,8 +322,8 @@ msgstr "deshabilitado"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "habilitado"
 
@@ -351,13 +341,13 @@ msgstr "El asistente configuró exitosamente los servicios DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Falló"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Vuelva a lanzar drakwizard, e intente cambiar algunos parámetros."
 
@@ -679,19 +669,24 @@ msgstr "Servidor de noticias"
 msgid "NFS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servidor Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selección del asistente de Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Por favor, seleccione un asistente"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -700,7 +695,7 @@ msgstr ""
 "%s no está instalado\n"
 "Pulse sobre «Siguiente» para instalarlo o sobre «Cancelar» para salir"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
@@ -989,11 +984,6 @@ msgstr "Asistente de configuración de Kolab"
 msgid "Master kolab server"
 msgstr "Servidor DNS maestro"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Servidor DNS esclavo"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1026,22 +1016,22 @@ msgstr "Bienvenido al asistente de configuración del servidor Groupware Kolab."
 msgid "Master or slave Kolab server"
 msgstr "Servidor DNS maestro"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Su servidor Ldap ya ha sido configurado"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Servidor DNS esclavo"
@@ -1117,7 +1107,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1151,21 +1144,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "El servidor Kolab ahora está configurado y corriendo. Conéctese como "
 "'manager' con la contraseña que ingresó en https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando servidor Kolab en su sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servidor Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Asistente de Ldap"
@@ -1519,7 +1513,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "La ruta que ingresó no existe."
 
@@ -2183,7 +2177,7 @@ msgstr ""
 "su proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3854,19 +3848,19 @@ msgstr "Configurando su servidor Samba..."
 msgid "OpenSSH server"
 msgstr "Servidor Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Asistente de la hora"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Probar de nuevo"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Guardar la configuración sin probar"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3874,16 +3868,16 @@ msgstr ""
 "Este asistente lo ayudará a ajustar la hora de su servidor sincronizada con "
 "un servidor de la hora externo."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Entonces, su servidor será el servidor local de la hora para su red."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "presione Siguiente para comenzar, o Cancelar para salir de este asistente"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3891,35 +3885,35 @@ msgstr ""
 "(le recomendamos usar pool.ntp.org dos veces ya que este servidor apunta "
 "aleatoriamente a los servidores de la hora disponibles)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Seleccione un servidor primario y uno secundario de la lista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servidores de la hora"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Servidor de la hora primario:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Servidor de la hora secundario:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Seleccione un huso horario"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Seleccione una región:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Seleccione un país:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3927,36 +3921,36 @@ msgstr ""
 "Si el servidor de la hora no está disponible de inmediato (red u otra "
 "razón), esperará aproximadamente 30 segundos."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 "Presione Siguiente para comenzar con la prueba de servidores de la hora."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Probando la disponibilidad de los servidores de la hora"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Los servidores de la hora no responden. Las causas pueden ser:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- no existen servidores de la hora"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- sin red externa"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- otras razones..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3964,11 +3958,11 @@ msgstr ""
 "Puede volver a intentar contactar con los servidores de la hora, o guardar "
 "la configuración sin ajustar la hora."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configuración del servidor de la hora guardada"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Ahora su servidor puede actuar como un servidor de la hora para su red local."
@@ -4010,15 +4004,15 @@ msgstr ""
 "Su servidor puede actuar como un servidor web hacia su red interna "
 "(Intranet) y como un servidor web para la Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Habilitar el servidor web para la Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Habilitar el servidor web para la Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4028,11 +4022,11 @@ msgstr ""
 "directorios personales disponible en su servidor http a través de http://www."
 "suservidor.com/~usuario, luego se le pedirá el nombre de este directorio."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Módulos:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4043,7 +4037,7 @@ msgstr ""
 "disponible en su servidor http a través de http://www.suservidor.com/"
 "~usuario."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4052,29 +4046,29 @@ msgstr ""
 "directorios personales (sin ~/) para que estén disponibles por medio de "
 "http://www.suservidor.com/~usuario"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Debe primero configurar un servidor Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "subdirectorio http del usuario: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Ingrese la ruta del directorio que desea que sea la raíz de los documentos."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Raíz de los documentos:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configurando el servidor web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4082,30 +4076,43 @@ msgstr ""
 "El asistente recolectó los siguientes parámetros necesarios para configurar "
 "su servidor web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Servidor web Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Servidor web de Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Directorio de usuario:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "El asistente configuró con éxito su servidor web Intranet/Internet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servidor Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando su sistema como un servidor Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "El comando todavía está ejecutando ¿Desea finalizarlo y salir del "
+#~ "Asistente?"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Servidor DNS esclavo"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Dominio de correo:"
 
diff --git a/po/et.po b/po/et.po
index f788055b..4e8b5e70 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-27 11:50+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -21,8 +21,8 @@ msgstr "seadistuste nõustaja"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Hoiatus."
 
@@ -34,17 +34,17 @@ msgstr "Viga."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Õnnitlused"
 
@@ -122,42 +122,42 @@ msgid "Warning"
 msgstr "Hoiatus"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Viga"
 
@@ -220,15 +220,6 @@ msgstr ""
 "ehk täielikult kvalifitseeritud domeeninimi. Käivitage täpsustamiseks "
 "Drakconnect."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Käsk töötab veel. Kas soovite selle tappa ja nõustajast väljuda?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Sulge"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP nõustaja"
@@ -315,8 +306,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "keelatud"
 
@@ -324,8 +315,8 @@ msgstr "keelatud"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "lubatud"
 
@@ -343,13 +334,13 @@ msgstr "Nõustaja seadistas edukalt DHCP-teenused."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Ebaõnnestus"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
@@ -663,19 +654,24 @@ msgstr "Uudisteserver"
 msgid "NFS server"
 msgstr "NFS-server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolabi server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizardi nõustaja valik"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Palun valige nõustaja"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -685,7 +681,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -950,11 +946,6 @@ msgstr "Kolabi seadistamise nõustaja"
 msgid "Master kolab server"
 msgstr "Esmane nimeserver"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Teisene nimeserver"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -986,22 +977,22 @@ msgstr "Tere tulemast kasutama Kolabi grupitööserveri seadistamise nõustajat.
 msgid "Master or slave Kolab server"
 msgstr "Esmane nimeserver"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Te olete juba seadistanud oma LDAP-serveri"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Teisene nimeserver"
@@ -1076,7 +1067,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1110,22 +1104,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolabi server on nüüd seadistatud ja töötab. Logige sisse haldurina "
 "(manager) aadressil https://127.0.0.1/kolab/admin/, kasutades äsja "
 "sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolabi server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP nõustaja"
@@ -1472,7 +1467,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Kataloog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Sisestatud asukohta ei ole olemas."
 
@@ -2137,7 +2132,7 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja puhverserveri seadistamiseks:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3815,19 +3810,19 @@ msgstr "SSH serveri seadistamine..."
 msgid "OpenSSH server"
 msgstr "OpenSSH server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Aja nõustaja"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Proovi uuesti"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Seadistuse salvestamine testimata"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3835,17 +3830,17 @@ msgstr ""
 "See nõustaja aitab määrata Teie serveri aja sünkroniseeritult välise "
 "ajaserveriga."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Niisiis on Teie server kohalik ajaserver Teie võrgu jaoks."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "vajutage alustamiseks nupule \"Järgmine\" või nõustajast lahkumiseks \"Loobu"
 "\""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3853,35 +3848,35 @@ msgstr ""
 "(me soovitame kasutada pool.ntp.org kaks korda, sest see server viitab "
 "suvaliselt kättesaadavatele ajaserveritele)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Valige nimekirjast esmane ja teisene server."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Ajaserverid"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Esmane ajaserver:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Teisene ajaserver:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Valige ajavöönd"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Valige piirkond:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Valige riik:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3889,35 +3884,35 @@ msgstr ""
 "Kui ajaserver otsekohe ei vasta (võrguvea või mõne muu põhjuse tõttu), tuleb "
 "Teil oodata umbes 30 sekundit."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Ajaserveri testi alustamiseks vajutage nupule \"Järgmine\"."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Ajaserverite kättesaadavuse testimine"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Ajavöönd:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Ajaserverid ei vasta. Põhjuseks võib olla:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- olematud ajaserverid"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- väline võrk puudub"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- muud põhjused..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3925,11 +3920,11 @@ msgstr ""
 "Võite proovida veel kord ühendust saada ajaserveritega või salvestada "
 "seadistuse ilma aega tegelikult määramata."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Ajaserveri seadistus salvestatud"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Teie server on nüüd valmis täitma kohtvõrgu jaoks ajaserveri ülesandeid."
@@ -3972,15 +3967,15 @@ msgstr ""
 "Server võib toimida veebiserverina nii Teie kohtvõrgu (intranet) kui "
 "Interneti jaoks."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Veebiserveri lubamine intranetile"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Veebiserveri lubamine Internetile"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3990,11 +3985,11 @@ msgstr ""
 "kättesaadavaks Teie http-serveris aadressil http://www.teieserver.ee/"
 "~kasutaja, selle kataloogi nime päritakse hiljem."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moodulid: "
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4002,7 +3997,7 @@ msgstr ""
 "Lubab kasutajatel muuta kataloogi nende kodukataloogides kättesaadavaks Teie "
 "http-serveris aadressil http://www.teieserver.ee/~kasutaja."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4010,58 +4005,69 @@ msgstr ""
 "Kirjutage kataloogi nimi, kuhu kasutajad võivad luua oma kodukataloogi (ilma "
 "~/), et muuta see kättesaadavaks aadressil http://www.teieserver.ee/~kasutaja"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Teil tuleb määrata kohalik Internetidomeeni nimi."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "kasutaja http-alamkataloog: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Sisestage kataloogi asukoht, mis peaks olema dokumentide juurkataloog."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumentide juurkataloog:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Veebiserveri seadistamine"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja veebiserveri seadistamiseks"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intraneti veebiserver:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Interneti veebiserver:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Kasutaja kataloog:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache'i server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache'i serveriks..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Käsk töötab veel. Kas soovite selle tappa ja nõustajast väljuda?"
+
+#~ msgid "Close"
+#~ msgstr "Sulge"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Teisene nimeserver"
+
 #~ msgid "Mail domain:"
 #~ msgstr "E-posti domeen:"
 
diff --git a/po/eu.po b/po/eu.po
index 3d686e75..33e58255 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-29 00:33+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -24,8 +24,8 @@ msgstr "konfigurazio morroia"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Abisua."
 
@@ -37,17 +37,17 @@ msgstr "Errorea."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Zorionak"
 
@@ -124,44 +124,44 @@ msgid "Warning"
 msgstr "Abisua"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "dhcp erabiltzen ari zara, baliteke zerbitzariak zure konfigurazioarekin ez "
 "funtzionatzea."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Errorea"
 
@@ -224,16 +224,6 @@ msgstr ""
 "behar da: Fully Qualified Domain Name/Erabat Kualifikatutako Domeinu Izena. "
 "Abiarazi drakconnect berau egokitzeko."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Komandoa martxan da oraindik. Berau akabatu eta Morroitik irten nahi duzu?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Itxi"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP morroia"
@@ -323,8 +313,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "desgaituta"
 
@@ -332,8 +322,8 @@ msgstr "desgaituta"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "gaituta"
 
@@ -351,13 +341,13 @@ msgstr "Morroiak behar bezala konfiguratu ditu DHCP zerbitzuak."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Huts egin du"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Berrabiarazi drakwizard, eta saiatu parametro batzuk aldatzen."
 
@@ -673,19 +663,24 @@ msgstr "Berrien zerbitzaria"
 msgid "NFS server"
 msgstr "NFS zerbitzaria"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab zerbitzaria "
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP zerbitzaria"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard morroiaren hautapena"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Hautatu morroi bat"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -694,7 +689,7 @@ msgstr ""
 "%s ez dago instalatuta\n"
 "Sakatu \"Hurrengoa\" instalatzeko, edo \"Utzi\" irteteko"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
@@ -977,11 +972,6 @@ msgstr "Kolab konfigurazio-morroia"
 msgid "Master kolab server"
 msgstr "DNS zerbitzari maisua"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Mendeko DNS zerbitzaria"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1013,22 +1003,22 @@ msgstr "Ongi etorri Kolab talde-lanerako zerbitzaria konfiguratzeko morroira."
 msgid "Master or slave Kolab server"
 msgstr "DNS zerbitzari maisua"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Dagoeneko konfiguratu duzu zure Ldap Zerbitzaria"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Mendeko DNS zerbitzaria"
@@ -1103,7 +1093,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1137,22 +1130,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Orain, Kolab zerbitzaria konfiguratuta dago eta exekutatzen ari da. Hasi "
 "saioa 'kudeatzaile' gisa helbide honetan sartutako pasahitzarekin: "
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab zerbitzaria sisteman konfiguratzen..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab zerbitzaria "
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldapren morroia"
@@ -1505,7 +1499,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorioa:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Zuk sartutako bide-izena ez dago."
 
@@ -2163,7 +2157,7 @@ msgstr ""
 "Morroiak zure proxy-a konfiguratzeko behar diren parametroak bildu ditu:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3819,19 +3813,19 @@ msgstr "Zure OpenSSH zerbitzaria konfiguratzen..."
 msgid "OpenSSH server"
 msgstr "OpenSSH zerbitzaria"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Orduaren morroia"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Saiatu berriro"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Gorde konfigurazioa probatu gabe"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3839,16 +3833,16 @@ msgstr ""
 "Morroi honek zerbitzariaren ordua kanpoko ordu-zerbitzari batekin "
 "sinkronizatuta konfiguratzen laguntzen dizu"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Orduan, zure zerbitzaria zure sarerako orduaren zerbitzari lokala izango da."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "sakatu 'Hurrengoa' hasteko, edo 'Utzi' morroi hau uzteko"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3856,35 +3850,35 @@ msgstr ""
 "(pool.ntp.org zerbitzaria bitan erabiltzea gomendatzen dugu, zerbitzari "
 "horrek erabilgarri dauden orduaren zerbitzariak ausaz seinalatzen baititu)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Hautatu lehen eta bigarren mailako zerbitzaria zerrendatik."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Orduaren zerbitzariak"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Orduaren lehen zerbitzaria:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Orduaren bigarren zerbitzaria:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Aukeratu ordu-zona"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Aukeratu eskualdea:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Aukeratu herria:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3892,36 +3886,36 @@ msgstr ""
 "Orduaren zerbitzaria berehala erabilgarri ez badago (sareagatik edo "
 "bestelako arrazoiengatik), 30 segundo inguru atzeratuko da."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Sakatu 'Hurrengoa' ordu-zerbitzariaren proba hasteko."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Orduaren zerbitzarien erabilgarritasuna probatzen"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Ordu-zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 "Orduaren zerbitzariek ez dute erantzuten. Arrazoiak hauek izan daitezke:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ez dago orduaren zerbitzaririk"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ez dago kanpoko sarerik"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- bestelako arrazoiak..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3929,11 +3923,11 @@ msgstr ""
 "- Orduaren zerbitzariekin kontaktatzen berriro saia zaitezke edo "
 "konfigurazioa ordua ezarri gabe gorde dezakezu."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Orduaren zerbitzariaren konfigurazioa gordeta"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Zure zerbitzariak ezin du orduaren zerbitzari gisa jardun zure sare "
@@ -3976,15 +3970,15 @@ msgstr ""
 "Zure zerbitzariak Web gisa jardun dezake zure barne-sarearekin (intranet) "
 "eta Web zerbitzari gisa Internetekin."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Gaitu Web zerbitzaria intraneterako"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Gaitu Web zerbitzaria Interneterako"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3995,11 +3989,11 @@ msgstr ""
 "bidez: http://www.yourserver.com/~user. Gero direktorio horren izena "
 "eskatuko zaizu."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduluak:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4008,7 +4002,7 @@ msgstr ""
 "zerbitzarian http://www.zurezerbitzaria.com/~erabiltzailea bitartez "
 "eskuragarri jartzen uzten die."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4017,28 +4011,28 @@ msgstr ""
 "(~/ gabe), http://www.yourserver.com/~user helbidearen bidez eskuragarriegon "
 "dadin"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Bertako internet domeinu izana zehaztu behar duzu."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "erabiltzaileen http azpidirektorioa: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Idatzi dokumentuen erroa izatea nahi duzun direktorioaren bide-izena."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumentuen erroa:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Web zerbitzaria konfiguratzen"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4046,32 +4040,44 @@ msgstr ""
 "Morroiak zure Web zerbitzua konfiguratzeko behar diren parametroak bildu "
 "ditu:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intraneteko web zerbitzaria:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Interneteko web zerbitzaria:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Erabiltzailearen direktorioa:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Morroiak behar bezala konfiguratu du zure intraneteko/Interneteko Web "
 "zerbitzaria"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache zerbitzaria"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Sistema Apache zerbitzari gisa konfiguratzen..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Komandoa martxan da oraindik. Berau akabatu eta Morroitik irten nahi duzu?"
+
+#~ msgid "Close"
+#~ msgstr "Itxi"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Mendeko DNS zerbitzaria"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Postaren domeinua:"
 
diff --git a/po/fa.po b/po/fa.po
index bc92ac60..5935ce87 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-07 21:55-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -24,8 +24,8 @@ msgstr "جادوگر پیکربندی"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "هشدار."
 
@@ -37,17 +37,17 @@ msgstr "خطا."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "تبریک می‌گوئیم "
 
@@ -124,42 +124,42 @@ msgid "Warning"
 msgstr "هشدار"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "خطا"
 
@@ -221,16 +221,6 @@ msgstr ""
 "نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان باید یک "
 "FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن آن اجرا کنید."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"فرمان هنوز در حال اجراست. آیا میخواهید آن را بکشید و جادوگر را ترک کنید؟"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "بستن"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "جادوگر DHCP"
@@ -319,8 +309,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "از کار افتاده"
 
@@ -328,8 +318,8 @@ msgstr "از کار افتاده"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "بکار افتاده"
 
@@ -347,13 +337,13 @@ msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارت
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "شکست خورد"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "drakwizard را دوباره راه‌اندازی کرده و تلاش کنید بعضی از پارامترها را نغییر "
@@ -675,19 +665,24 @@ msgstr "کارگزار اخبار"
 msgid "NFS server"
 msgstr "کارگزار NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "کارگزار‌ Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "کارگزار FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "انتخاب جادوگر Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "لطفاً جادوگری را انتخاب کنید"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -696,7 +691,7 @@ msgstr ""
 "%s نصب نشده است\n"
 "\"بعدی\" را برای نصب یا \"لغو\" را برای ترک کردن کلیک کنید"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
@@ -981,11 +976,6 @@ msgstr "جادوگر پیکربندی Kolab"
 msgid "Master kolab server"
 msgstr "کارگزار ارشد DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "کارگزار برده‌ی DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1016,22 +1006,22 @@ msgstr "به جادوگر پیکربندی کارگزار گروه‌افزار
 msgid "Master or slave Kolab server"
 msgstr "کارگزار ارشد DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "شما از قبل کارگزار Ldap خود را پیکربندی کرده‌اید"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "کارگزار برده‌ی DNS"
@@ -1107,7 +1097,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1141,21 +1134,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "کارگزار kolab اکنون پیکربندی شده و در حال اجراست. مانند مدیر با گذرواژه‌ای که "
 "وارد کردیددر http://127.0.0.1/kolab/admin ثبت ورود کنید."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "در حال پیکربندی کارگزار Kolab بر سیستم شما..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "کارگزار‌ Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "جادوگر سامبا"
@@ -1501,7 +1495,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "شاخه:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "مسیری که وارد کردید وجود ندارد."
 
@@ -2149,7 +2143,7 @@ msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی پراکسی شما جمع آوری کرد:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3797,19 +3791,19 @@ msgstr "پیکربندی کارگزار سامبای شما..."
 msgid "OpenSSH server"
 msgstr "کارگزار آپاچی"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "جادوگر زمان"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "دوباره امتحان کنید"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "ذخیره‌ی پیکربندی بدون آزمایش"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3817,15 +3811,15 @@ msgstr ""
 "این جادوگر به شما در تعیین زمان کارگزارتان هم‌گاه‌سازی شده با یک کارگزار زمان "
 "بیرونی کمک خواهد کرد."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "از این قرار کارگزار شما برای شبکه‌تان کارگزار زمان محلی خواهد شد."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "بعدی را برای شروع، یا لغو را برای ترک این جادوگر فشار دهید"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3833,35 +3827,35 @@ msgstr ""
 "(سفارش می کنیم که از کارگزار pool.ntp.org دوبار استفاده کنید چونکه این "
 "کارگزار به کارگزارهای در دسترس زمان بطور تصادفی اشاره می‌کند)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "انتخاب یک کارگزار اولیه و ثانویه از لیست."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "کارگزارهای زمان"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "کارگزار زمان اولیه:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "کارگزار زمان ثانویه:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "انتخاب یک منطقه‌ی زمانی:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "انتخاب یک منطقه:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "انتخاب یک کشور:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3869,35 +3863,35 @@ msgstr ""
 "اگر کارگزار زمان بلافاصله موجود نیست ( شبکه یا دلیل دیگر)، حدود ۳۰ ثانیه "
 "تأخیر وجود خواهد داشت."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "بعدی را فشار دهید تا آزمایش کارگزارهای زمان شروع شود."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "آزمایش در دسترس بودن کارگزارهای زمان"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "منطقه‌ی زمانی:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "کارگزارهای زمان جواب نمی‌دهند. دلایل آن:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- کارگزارهای زمان غیر موجود"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- هیچ شبکه‌ی بیرونی"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- دلایل دیگر..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3905,11 +3899,11 @@ msgstr ""
 "- شما می‌توانید برای تماس با کارگزارهای زمان دوباره تلاش کنید، یا پیکربندی را "
 "در حقیقتبدون گذاردن زمان ذخیره کنید."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "پیکربندی کارگزار زمان ذخیره شد"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "کارگزار شما اکنون می‌تواند مانند یک کارگزار زمان برای شبکه‌ی محلی‌تان عمل کند."
@@ -3951,15 +3945,15 @@ msgstr ""
 "کارگزار شما می‌تواند مانند یک کارگزار وب برای شبکه درونی (اینترانت) و یک "
 "کارگزار وب برای اینترنت عمل کند."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "بکار انداختن کارگزار وب برای اینترانت"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "بکار انداختن کارگزار وب برای اینترنت"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3969,11 +3963,11 @@ msgstr ""
 "کارگزار اینترنت شما مانند http://www.yourserver.com/~user داشته باشند، از "
 "شما نام این شاخه پس از این پرسیده خواهد شد."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "بخش‌ها:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3982,7 +3976,7 @@ msgstr ""
 "به کاربرها اجازه می‌دهد تا شاخه‌ای در شاخه‌های خانه‌ی خود بر روی کارگزار اینترنت "
 "شما مانند http://www.yourserver.com/~user داشته باشند."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3990,28 +3984,28 @@ msgstr ""
 "نام شاخه‌ای را که کاربرها باید در خانه‌های خود(بدون ~/) ایجاد کنند را برای در "
 "دسترس قرار گرفتن آنها از طریق http://www.yourserver.com/~user تایپ کنید"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "شما باید یک کارگزار Ldap را نخست برپاسازی کنید."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "زیر-شاخه اینترنت کاربر: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "مسیر شاخه‌ای را که می‌خواهید ریشه‌ی نوشتار باشد تایپ کنید."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "ریشه نوشتار:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "پیکربندی کارگزار وب"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4019,30 +4013,42 @@ msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی کارگزار وب شما جمع آوری "
 "کرد"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "کارگزار وب اینترانت:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "کارگزار وب اینترنت:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "شاخه‌ی کاربر:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "جادوگر با موفقیت کارگزار وب اینترنت/اینترانت شما را پیکربندی کرد"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "کارگزار آپاچی"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار آپاچی ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "فرمان هنوز در حال اجراست. آیا میخواهید آن را بکشید و جادوگر را ترک کنید؟"
+
+#~ msgid "Close"
+#~ msgstr "بستن"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "کارگزار برده‌ی DNS"
+
 #~ msgid "Mail domain:"
 #~ msgstr "دامنه‌ی پست:"
 
diff --git a/po/fi.po b/po/fi.po
index 843299fa..5bf2ecb4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - LE2005 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-03-30 22:18-0500\n"
 "Last-Translator: Thomas Backlund <tmb@mandrivalinux.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -26,8 +26,8 @@ msgstr "asetusvelho"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Varoitus."
 
@@ -39,17 +39,17 @@ msgstr "Virhe."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Onnittelut"
 
@@ -127,42 +127,42 @@ msgid "Warning"
 msgstr "Varoitus"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Virhe"
 
@@ -225,15 +225,6 @@ msgstr ""
 "oikean verkkoalueen nimi, joka ei saa olla localdomain tai none, vaan pitää "
 "olla FQDN. Käytä drakconnect muokataaksesi sitä."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Komento suoritetaan vielä. Haluatko tappaa sitä ja lopettaa velhon?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Sulje"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Velho"
@@ -323,8 +314,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "Poistettu käytöstä"
 
@@ -332,8 +323,8 @@ msgstr "Poistettu käytöstä"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "Käytössä"
 
@@ -351,13 +342,13 @@ msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Epäonnistui"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
@@ -676,19 +667,24 @@ msgstr "Uutisryhmäpalvelin"
 msgid "NFS server"
 msgstr "NFS-palvelin"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-palvelin"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard velhojen valinta"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Ole hyvä ja valitse velho"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -697,7 +693,7 @@ msgstr ""
 "%s ei ole asennettu.\n"
 "Paina \"Seuraava\" asentaaksesi tai \"Poistu\" lopettaaksesi."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
@@ -980,11 +976,6 @@ msgstr "Kolab asetusvelho"
 msgid "Master kolab server"
 msgstr "Isäntä DNS-palvelin"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Orja DNS-palvelin"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1016,22 +1007,22 @@ msgstr "Tervetuloa Kolab Groupware palvelimen asetusvelhoon"
 msgid "Master or slave Kolab server"
 msgstr "Isäntä DNS-palvelin"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Olet jo määrittänyt LDAP palvelintasi"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Orja DNS-palvelin"
@@ -1107,7 +1098,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1141,21 +1135,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab palvelin on nyt asetettu ja käytössä. Kirjaudu tunnuksella 'manager' "
 "ja antamasi salasanalla osoitteessa: https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi Kolab-palvelinta..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-palvelin"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP velho"
@@ -1505,7 +1500,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Hakemisto:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Annettua hakemistoa ei ole."
 
@@ -2164,7 +2159,7 @@ msgstr ""
 "asettamiseksi:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3831,19 +3826,19 @@ msgstr "Asetetaan Samaba-palvelimesi."
 msgid "OpenSSH server"
 msgstr "Apache palvelin"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Aika velho"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Yritä uudelleen"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Tallenna asetukset ilman kokeilua"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3851,15 +3846,15 @@ msgstr ""
 "Tämä velho auttaa asettamaan palvelimesi ajan tahdistettuna ulkoiseen "
 "aikapalvelimeen."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Näin palvelimesi toimii paikallisena aikapalvelimena verkollesi."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "paina 'Seuraava' aloittaaksesi, tai 'Peruuta' poistuaksesi velhosta."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3867,35 +3862,35 @@ msgstr ""
 "(suosittelemme että käytät osoitetta pool.ntp.org kahdesti koska tämä "
 "osoittaa satunnaiseen käytettävissä olevaan aikapalvelimeen)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Valitse ensisijainen ja toissijainen palvelin listalta."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Aikapalvelimet"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Ensisijainen aikapalvelin:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Toissijainen aikapalvelin:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Valitse aikavyöhyke:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Valitse alue:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Valitse maa:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3903,35 +3898,35 @@ msgstr ""
 "Jos aikapalvelin ei ole heti käytössä (verkko- tai muista syistä), seuraa "
 "noin 30 sekunnin viive"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Paina 'Seuraava' käynnistääksesi aikapalvelimien testauksen."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Kokeillaan aikapalvelinten käytön toimivuutta"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Aikavyöhyke:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Aikapalvelimet eivät vastaa. Syinä tähän voi olla:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- aikapalvelin ei ole olemassa"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ei ulkoista verkkoa"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- muut syyt..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3939,11 +3934,11 @@ msgstr ""
 "- Voit yrittää ottaa yhteyttä aikapalvelimille uudelleen, tai tallenna "
 "asetukset säätämättä kelloa."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Aikapalvelimen asetukset tallennettu"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Palvelimesi voi nyt toimia aikapalvelimena paikallisverkollesi."
 
@@ -3984,15 +3979,15 @@ msgstr ""
 "Palvelimesi voi toimia WWW-palvelimena paikallisverkollesi (intranet) sekä "
 "Internetiin."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Ota käyttöön paikallisverkon (intranet) WWW-palvelin"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Ota käyttöön Internetin WWW-palvelin"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4002,11 +3997,11 @@ msgstr ""
 "näkyy osoitteessa http://www.sinunpalvelin.com/~kayttaja, sinulta kysytään "
 "tämän hakemiston nimi myöhemmin."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduulit:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4015,7 +4010,7 @@ msgstr ""
 "Käyttäjät saavat kotihakemistoonsa hakemiston, joka näkyy \n"
 "palvelimella http://www.sinunpalvelin.com/~kayttaja."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4023,28 +4018,28 @@ msgstr ""
 "Anna hakemiston nimi joka käyttäjien tulisi luoda kotihakemistoonsa (ilman "
 "~/) saadakseen sen saataville http://www.sinunpalvelin.com/~kayttaja kautta."
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Sinun täytyy asettaa LDAP-palvelinta ensin."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "käyttäjän http-alihakemisto: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Anna hakemisto jonka haluat olevan dokumenttien juurihakemisto."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumenttien juurihakemisto:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Asetetaan WWW-palvelin"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4052,30 +4047,41 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan WWW-palvelimen "
 "asettamiseksi:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet WWW-palvelin:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet WWW-palvelin:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Käyttäjien hakemisto:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Velho asetti Intranet/Internet WWW-palvelimesi onnistuneesti."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache palvelin"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Komento suoritetaan vielä. Haluatko tappaa sitä ja lopettaa velhon?"
+
+#~ msgid "Close"
+#~ msgstr "Sulje"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Orja DNS-palvelin"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Sähköposti verkkoalue:"
 
diff --git a/po/fr.po b/po/fr.po
index 34144b26..e38ab69d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-01 22:58+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
@@ -35,8 +35,8 @@ msgstr "assistant de configuration"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Attention."
 
@@ -48,17 +48,17 @@ msgstr "Erreur."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Félicitations"
 
@@ -137,44 +137,44 @@ msgid "Warning"
 msgstr "Attention"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Vous êtes en DHCP, le serveur pourrait ne pas marcher avec cette "
 "configuration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Erreur"
 
@@ -238,17 +238,6 @@ msgstr ""
 "nul. Le nom d'hôte doit être un nom de domaine pleinement qualifié. Lancez "
 "drakconnect pour l'ajuster."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"La commande est en cours d'exécution. Voulez-vous la terminer et quitter "
-"l'assistant ?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Fermer"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Assistant de configuration DHCP"
@@ -341,8 +330,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "désactivé"
 
@@ -350,8 +339,8 @@ msgstr "désactivé"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "activé"
 
@@ -369,13 +358,13 @@ msgstr "L'assistant a configuré avec succès les services DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Échec"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Relancez drakwizard en changeant quelques paramètres."
 
@@ -692,19 +681,24 @@ msgstr "Serveur de nouvelles (news)"
 msgid "NFS server"
 msgstr "Serveur de fichiers (NFS)"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Serveur Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Serveur de fichiers (FTP)"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Choix de l'assistant Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Veuillez choisir un assistant"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -713,7 +707,7 @@ msgstr ""
 "le paquetage %s n'est pas installé\n"
 "Cliquez sur « Suivant » pour l'installer ou « Annuler » pour quitter"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
@@ -1007,11 +1001,6 @@ msgstr "Assistant de configuration de Kolab"
 msgid "Master kolab server"
 msgstr "Esmane nimeserver"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Teisene nimeserver"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1042,22 +1031,22 @@ msgstr "Bienvenue dans l'Assistant de configuration du serveur Kolab."
 msgid "Master or slave Kolab server"
 msgstr "Esmane nimeserver"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Te olete juba seadistanud oma LDAP-serveri"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Teisene nimeserver"
@@ -1132,7 +1121,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1167,23 +1159,24 @@ msgstr ""
 msgid "With CA"
 msgstr ""
 
+#: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
 # C. Berthelé 28 august 2005 should \n be kept in the french text ?
 #: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Le serveur Kolab est désormais prêt et configuré. Identifiez vous en tant\n"
 "que « manager » à l'adresse suivante https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Configuration du serveur Kolab sur votre système..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Serveur Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Assistant LDAP"
@@ -1537,7 +1530,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Répertoire :"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Le chemin entré n'existe pas."
 
@@ -2216,7 +2209,7 @@ msgstr ""
 "votre proxy :"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3970,19 +3963,19 @@ msgstr "Configuration du serveur SSH..."
 msgid "OpenSSH server"
 msgstr "Serveur OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Assistant de date/heure"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Réessayer"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Enregistrer la configuration sans tester"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3990,18 +3983,18 @@ msgstr ""
 "Cet assistant va vous aider à synchroniser la date et l'heure de votre "
 "serveur avec un serveur de temps externe."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Votre serveur sera le serveur de temps pour votre réseau."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Cliquez sur « Suivant » pour commencer, ou « Annuler » pour quitter "
 "l'assistant."
 
 # tried to make it more understandable to simple persons like me
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -4009,35 +4002,35 @@ msgstr ""
 "(conseil : utiliser pool.ntp.org deux fois car ce serveur utilise de manière "
 "aléatoire différents serveurs de temps disponibles)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Sélectionnez un serveur primaire et secondaire dans la liste."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Serveurs de temps"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Serveur de temps primaire :"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Serveur de temps secondaire :"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Choisissez un fuseau horaire"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Choisissez une région :"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Choisissez une ville :"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -4045,35 +4038,35 @@ msgstr ""
 "Si le serveur de temps n'est pas pas immédiatement disponible (problème "
 "réseau ou autre) vous devrez peut-être attendre jusqu'à 30 secondes."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Cliquez sur « Suivant » pour démarrer le test du serveur de temps."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Test de la disponibilité du serveur de temps."
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Fuseau horaire :"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Les serveurs de temps ne répondent pas, cela peut être dû à :"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- Serveurs de temps inexistant"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- pas de réseau extérieur"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- Autres raisons..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -4081,11 +4074,11 @@ msgstr ""
 "- Vous pouvez tester de nouveau le serveur de temps ou enregistrer la "
 "configuration sans mettre à jour l'heure maintenant."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configuration du serveur de temps enregistrée"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "votre serveur peut maintenant agir comme un serveur de temps pour votre "
@@ -4129,15 +4122,15 @@ msgstr ""
 "Votre serveur peut être configuré comme serveur Web pour votre réseau local "
 "(intranet), ou comme serveur Web pour Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Activer le serveur Web pour l'intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Activer le serveur Web pour l'internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4148,11 +4141,11 @@ msgstr ""
 "l'adresse http://www.votreserveur.com/~utilisateur.  Le nom de ce répertoire "
 "vous sera demandé juste après."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modules :"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4162,7 +4155,7 @@ msgstr ""
 "votreserveur.com/~utilisateur."
 
 # mistake in the msgid version whitout<->without
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4171,30 +4164,30 @@ msgstr ""
 "répertoire personnel (sans le « ~/ »)  de façon à le rendre disponible par "
 "le Web à l'adresse http://www.votreserveur.com/~utilisateur"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Vous devez fournir un nom de domaine local."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sous-répertoire http utilisateur : ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Tapez le chemin local qui correspond à la racine des documents fournis par "
 "votre serveur Web."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Racine des documents :"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configuration du serveur Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4202,31 +4195,44 @@ msgstr ""
 "L'assistant a rassemblé les paramètres suivants nécessaires pour la "
 "configuration du serveur web :"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Serveur Web intranet :"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Serveur Web Internet :"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Répertoire utilisateur :"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'assistant a configuré avec succès votre serveur Web intranet/Internet."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Serveur Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurer votre système en tant que serveur Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "La commande est en cours d'exécution. Voulez-vous la terminer et quitter "
+#~ "l'assistant ?"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Teisene nimeserver"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Domaine de courriel :"
 
diff --git a/po/fur.po b/po/fur.po
index bc368779..270e02f7 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-06-28 17:19+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -23,8 +23,8 @@ msgstr "configuration wizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Avertence."
 
@@ -36,17 +36,17 @@ msgstr "Fal."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Congratulazions"
 
@@ -122,44 +122,44 @@ msgid "Warning"
 msgstr "Avertence"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Tu stas doprant dhcp, il server al podares no funzionâ un le to "
 "configurazion."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fal"
 
@@ -224,15 +224,6 @@ msgstr ""
 "di domini valevul, diferent dal domini locâl o di vueit. Invie drakconnect "
 "par mudâlu."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Siere"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Assistent DHCP"
@@ -322,8 +313,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "disabilitât"
 
@@ -331,8 +322,8 @@ msgstr "disabilitât"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "abilitât"
 
@@ -350,13 +341,13 @@ msgstr "L'assistent al à configurât cun sucès i servizis DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Falât"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Torne a inviâ drakwizard, e cîr di mudâ cualchi parametri."
 
@@ -679,19 +670,24 @@ msgstr "Server News"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Server Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selezion dal assistent Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Par plasè, sielç un assistent"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -700,7 +696,7 @@ msgstr ""
 "%s nol è instalât\n"
 "Frache \"Prossin\" par instalâlu o \"Scancele\" par jessî"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
@@ -991,11 +987,6 @@ msgstr "Assistent di configurazion Kolab"
 msgid "Master kolab server"
 msgstr "Server DNS primari"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server DNS secondari"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1026,22 +1017,22 @@ msgstr "Benvignût  tal assistent di configurazion dal server Kolab Groupware."
 msgid "Master or slave Kolab server"
 msgstr "Server DNS primari"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "L'assistent al à configurât cun sucès il to server Samba."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server DNS secondari"
@@ -1117,7 +1108,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1151,21 +1145,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Il server Kolab al è configurât e in vore. Jentre sicu 'aministratôr' cun le "
 "password che tu âs insedât su https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "O stoi configurant il server Kolab tal to sisteme..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Server Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Assistent Ldap"
@@ -1526,7 +1521,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cartele:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Il percôrs che tu âs insedât nol esist."
 
@@ -2181,7 +2176,7 @@ msgstr ""
 "to proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3855,19 +3850,19 @@ msgstr "O configuri il to server Samba..."
 msgid "OpenSSH server"
 msgstr "Server Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Assistent dal timp"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Prove ancjemò"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Salve le configurazion cence provâ"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3875,49 +3870,49 @@ msgstr ""
 "Chest assistent ti judarâ a impostâ le ore dal to server sincronizade "
 "cunt'un server dal timp esterni."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Cussì il to server al diventarà il server locâl dal timp pe to rêt."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "frache prossin par scomençâ, o scancele par jessî di chest assistent"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Sielç un server primari e secondari de liste."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Server dal timp"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Server dal timp primari:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Server dal timp secondari:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Sielç un fûs orari"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Sielç une regjon:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Sielç une citât:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3925,35 +3920,35 @@ msgstr ""
 "Se il server dal timp nol è disponibil subit (par resons di rêt o altri), a "
 "si varâ un ritart di cirche 30 seconts."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Frache prossin par inviâ le prove dai server dal timp."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "O provi se i server dal timp e son disponibii"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Fûs orari:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "I server dal timp no rispuindin. Le resons e puedin sedi:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- server dal timp no esistints"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nissune rêt esterne"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- altris resons..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3961,11 +3956,11 @@ msgstr ""
 " Tu puedis provâ a contatâ i server dal timp o salvâ le configurazion cence "
 "impostâ daurman le ore."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configurazion dal server dal timp salvade"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Cumò il to server al po compuartâsi sicu server dal timp e to rêt locâl."
@@ -4007,15 +4002,15 @@ msgstr ""
 "Il to server a si po compuartâ sicu Web server te to rêt interne (intranet) "
 "e sicu server Web par Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Abilite il server Web pe rêt interne"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Abilite il server Web par Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4025,11 +4020,11 @@ msgstr ""
 "disponibil tal to server http al recapit http://iltoserver.com/~utent, plui "
 "indenant ti vignarâ domandât il non di cheste cartele."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modui:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4038,7 +4033,7 @@ msgstr ""
 "Permèt ai utents di vê une cartele tes lôr cartelis home \n"
 "disponibil tal to server http al recapit http://www.iltoserver.com/~utent."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4046,28 +4041,28 @@ msgstr ""
 "Insede il non de cartele che i utents e àn di creâ tes lôr cartelis home "
 "(cence ~) par che sedi disponibil al recapit http://www.iltoserver.com/~utent"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Sielç un server PXE."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sot-cartele utent http: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Insede il percors de cartele che tu vuelis che sedi le lidrie."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Lidrie:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "O configuri il server Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4075,30 +4070,37 @@ msgstr ""
 "L'assistent al à cjatât chescj parametris domandâts par configurâ il to "
 "server Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Server Web interni:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Server Web Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Cartele utent:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "L'assistent al à configurât cun sucès il to server interni/Internet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Server Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "O configuri il to sisteme sicu server Apache ..."
 
+#~ msgid "Close"
+#~ msgstr "Siere"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server DNS secondari"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Domini mail:"
 
diff --git a/po/ga.po b/po/ga.po
index c196565b..6a9f06e7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -21,8 +21,8 @@ msgstr ""
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr ""
 
@@ -34,17 +34,17 @@ msgstr "Earráid."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Comhghairdeas"
 
@@ -112,42 +112,42 @@ msgid "Warning"
 msgstr "Rabhadh"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Earráid"
 
@@ -200,15 +200,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Dún"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr ""
@@ -287,8 +278,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "díchumasaithe"
 
@@ -296,8 +287,8 @@ msgstr "díchumasaithe"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "cumasaithe"
 
@@ -315,13 +306,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Teipthe"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -608,26 +599,31 @@ msgstr ""
 msgid "NFS server"
 msgstr ""
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr ""
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Freastalaí FTP:"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr ""
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
@@ -880,11 +876,6 @@ msgstr ""
 msgid "Master kolab server"
 msgstr "Freastalaí Samba"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Freastalaí Samba"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -908,21 +899,21 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Freastalaí Samba"
@@ -996,7 +987,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1029,17 +1023,17 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
-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/"
+msgid "Done"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Configuring Kolab server on your system..."
+#: ../kolab_wizard/Kolab.pm:219
+msgid ""
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
+msgid "Configuring Kolab server on your system..."
 msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:32
@@ -1367,7 +1361,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Comhadlann:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -1950,7 +1944,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3476,111 +3470,111 @@ msgstr ""
 msgid "OpenSSH server"
 msgstr "Freastalaí DNS"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Déan iarracht arís"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3619,86 +3613,93 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid "Close"
+#~ msgstr "Dún"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Freastalaí Samba"
+
 #~ msgid "Warning:"
 #~ msgstr "Rabhadh:"
diff --git a/po/gl.po b/po/gl.po
index 1a6ee4b2..aa43bb8e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-06-17 18:52+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician\n"
@@ -21,8 +21,8 @@ msgstr "asistente de configuración"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Advertencia."
 
@@ -34,17 +34,17 @@ msgstr "Erro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Noraboa"
 
@@ -121,43 +121,43 @@ msgid "Warning"
 msgstr "Advertencia"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Está usando DHCP, e pode ser que servidor non funcione ca súa configuración."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Erro"
 
@@ -221,16 +221,6 @@ msgstr ""
 "branco. O nome de máquina debe ser un FQDN: Fully Qualified Domain Name. "
 "Execute drakconnect para adaptalo."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"O comando ainda se está executando. ¿Desexa matalo e saír do Asistente?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Pechar"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Asistente DHCP"
@@ -320,8 +310,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "deshabilitado"
 
@@ -329,8 +319,8 @@ msgstr "deshabilitado"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "habilitado"
 
@@ -348,13 +338,13 @@ msgstr "O asistente configurou con éxito os servicios DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Fallou"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Volva executar drakwizard, e intente cambiando algúns parámetros."
 
@@ -667,19 +657,24 @@ msgstr "Servidor de Novas"
 msgid "NFS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servidor Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selección de asistente de Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Seleccione un asistente"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -688,7 +683,7 @@ msgstr ""
 "%s non está instalado\n"
 "Prema \"Seguinte\" para instalalo ou \"Cancelar\" para saír"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Fallo na instalación"
 
@@ -973,11 +968,6 @@ msgstr "Asistente de configuración de Kolab"
 msgid "Master kolab server"
 msgstr "Servidor DNS Mestre"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Servidor DNS Escravo"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1005,22 +995,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Servidor DNS Mestre"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "O asistente vai configurar un servidor de correo interno."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Servidor DNS Escravo"
@@ -1096,7 +1086,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1130,21 +1123,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "O servidor kolab está configurado e executándose. Entre coma 'manager' co "
 "contrasinal que introduciu en https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab do seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servidor Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Asistente Ldap"
@@ -1489,7 +1483,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "A ruta que introduciu non existe."
 
@@ -2121,7 +2115,7 @@ msgstr ""
 "configurar o seu proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3786,19 +3780,19 @@ msgstr "Configurando o seu servidor Samba..."
 msgid "OpenSSH server"
 msgstr "Servidor Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Asistente de hora"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Inténteo de outra vez"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Gardar a configuración sen probala"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3806,15 +3800,15 @@ msgstr ""
 "Este asistente axudaralle a mante-la hora do seu servidor sincronizada cun "
 "servidor de hora externo."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Deste xeito o seu servidor será o servidor de hora local da súa rede."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "prema seguinte para comezar, ou cancelar para saír deste asistente"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3822,69 +3816,69 @@ msgstr ""
 "(recomendamos usar o servidor pool.ntp.org dúas veces porque este servidor "
 "apunta aleatoriamente a outros servidores de hora dispoñibles)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Seleccione un servidor primario e un secundario da lista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servidores de hora"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Servidor de hora primario:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Servidor de hora secundario:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Escolla unha zona horaria"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Escolla unha rexión:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Escolla unha cidade:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Prema seguinte para comezar a verificación dos servidores de tempo."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Verificando a dispoñibilidade dos servidores de hora"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Os servidores de hora non responderon. As causas poden ser:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- os servidores de hora non existen"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- non hai saída á rede"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- outras razóns..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3892,11 +3886,11 @@ msgstr ""
 "- Pode intentar contactar outra vez cos servidores de hora, ou gardar a "
 "configuración sen configura-la hora."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Gardouse a configuración do servidor de hora"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "O seu servidor pode actuar agora coma o servidor de hora local da súa rede."
@@ -3939,15 +3933,15 @@ msgstr ""
 "O seu servidor pode actuar coma un servidor Web cara a súa rede interne "
 "(intranet) e coma un servidor Web para a Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Habilita-lo servidor Web para a intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Habilita-lo servidor Web para a internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3958,11 +3952,11 @@ msgstr ""
 "oseuservidor.com/~usuario nun navegador, preguntaráselle o nome deste "
 "directorio máis tarde."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Módulos:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3972,7 +3966,7 @@ msgstr ""
 "dispoñible no seu servidor http escribindo http://www.oseuservidor.com/"
 "~usuario."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3981,29 +3975,29 @@ msgstr ""
 "directorios persoais (sen ~/) para que se poida acceder a el escribindo "
 "http://www.oseuservidor.com/~usuario"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Primeiro debe configurar un servidor Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sub-directorio http do usuario: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Introduza a ruta do directorio que quere que sexa a raíz dos documentos."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Raíz dos documentos:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configurando o servidor Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4011,31 +4005,43 @@ msgstr ""
 "O asistente reuniu os seguintes parámetros, que son necesarios para "
 "configurar o Servidor Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Servidor web de intranet"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Servidor web de Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Directorio de usuario:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "O asistente configurou con éxito o seu servidor web de Internet/intranet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servidor Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando o seu sistema coma servidor Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "O comando ainda se está executando. ¿Desexa matalo e saír do Asistente?"
+
+#~ msgid "Close"
+#~ msgstr "Pechar"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Servidor DNS Escravo"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Dominio de correo:"
 
diff --git a/po/he.po b/po/he.po
index a20c6e51..c0f3126d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-12 21:49+0300\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -29,8 +29,8 @@ msgstr "אשף הגדרות"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "אזהרה."
 
@@ -42,17 +42,17 @@ msgstr "שגיאה."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "איחולי"
 
@@ -124,42 +124,42 @@ msgid "Warning"
 msgstr "אזהרה"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "שגיאה"
 
@@ -221,15 +221,6 @@ msgstr ""
 "Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
 "לתקן הגדרות אלו."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "הפקודה עדיין מתבצעת. האם ברצונך להפסיק את ביצועה ולצאת מהאשף?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "סגור"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "אשף DHCP"
@@ -313,8 +304,8 @@ msgstr "אשף זה אסף את הנתונים הבאים אשר נדרשים ל
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "חסום"
 
@@ -322,8 +313,8 @@ msgstr "חסום"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "מאופשר"
 
@@ -341,13 +332,13 @@ msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של �
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "נכשל"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "עליך להריץ מחדש את drakwizard, ולנסות לשנות מספר הגדרות."
 
@@ -653,19 +644,24 @@ msgstr "שרת קבוצות דיון"
 msgid "NFS server"
 msgstr "שרת NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "שרת Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "שרת FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "בחירת אשף Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "נא לבחור אחד מהאשפים"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -674,7 +670,7 @@ msgstr ""
 "%s לא מותקן\n"
 "נא ללחוץ \"המשך\" בכדי להתקין, או \"ביטול\" כדי לצאת"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
@@ -937,11 +933,6 @@ msgstr "אשף הגדרת Kolab"
 msgid "Master kolab server"
 msgstr "שרת DNS ראשי"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "שרת DNS משני"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -972,22 +963,22 @@ msgstr "ברוך בואך לאשף הגדרת השרת של המערכת לקב�
 msgid "Master or slave Kolab server"
 msgstr "שרת DNS ראשי"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "כבר הגדרת את שרת הLDAP שלך"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "שרת DNS משני"
@@ -1062,7 +1053,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1096,21 +1090,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "שרת Kolab מוגדר ופועל כעת. עליך להתחבר למערכת בשם משתמש 'manager' עם הסיסמה "
 "שהגדרת בכתובת https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "הגדרת שרת Kolab על המערכת שלך..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "שרת Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "אשף Ldap"
@@ -1450,7 +1445,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "ספריה:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "הספרייה בה בחרת אינה קיימת."
 
@@ -2074,7 +2069,7 @@ msgid ""
 msgstr "האשף אסף את הנתונים הבאים הדרושים להגדרת השרת המתווך שלך:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3672,33 +3667,33 @@ msgstr "מגדיר את שרת ה-OpenSSH שלך..."
 msgid "OpenSSH server"
 msgstr "שרת OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "אשף זמן"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "יש לנסות שנית"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "שמירת הגדרות ללא בדיקות"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr "אשף זה יעזור לך בהגדרת סנכרון הזמן בשרת שלך עם שרת זמן חיצוני"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "לפיכך השרת שלך יתפקד כשרת הזמן המקומי עבור הרשת שלך."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "נא לבחור \"המשך\" בכדי להתחיל, או \"ביטול\" בכדי לצאת מאשף זה"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3706,35 +3701,35 @@ msgstr ""
 "(מומלץ להגדיר את pool.ntp.org פעמיים היות ושרת זה מצביע באופן אקראי לשרתי "
 "זמן זמינים)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "נא לבחור שרת ראשי ושרת משני מתוך הרשימה."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "שרתי זמן"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "שרת זמן עיקרי:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "שרת זמן משני:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "יש לבחור אזור זמן"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "יש לבחור אזור גאוגרפי:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "יש לבחור עיר:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3742,35 +3737,35 @@ msgstr ""
 "אם שרת הזמן לא זמין מידית (בגלל הרשת או כל סיבה אחרת), תתכן השהייה של כ 30 "
 "שניות."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "יש לבחור ב\"המשך\" בכדי להתחיל בבדיקת שרתי הזמן."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "בדיקת זמינות שרתי הזמן"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "אזור זמן:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "שרתי הזמן אינם מגיבים. הסיבה יכולה להיות:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "-- שרתי זמן לא קיימים"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- אין רשת חיצונית"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- סיבות אחרות..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3778,11 +3773,11 @@ msgstr ""
 "- ניתן לנסות שנית להתקשר לשרתי הזמן, או לשמור את ההגדרות מבלי לכוונן את "
 "השעון בפועל."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "הגדרת שרת הזמן נשמרה"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "השרת שלך יכול לתפקד כעת כשרת זמן לרשת המקומית שלך."
 
@@ -3823,15 +3818,15 @@ msgstr ""
 "השרת שלך יכול לשמש כשרת אחסון אתרים עבור הרשת הפנימית שלך (Intranet) וכשרת "
 "אחסון אתרים עבור האינטרנט."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "אפשר שרת אחסון אתרים לגישה מהרשת המקומית"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "אפשר שרת אחסון אתרים לגישה מהאינטרנט"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3841,11 +3836,11 @@ msgstr ""
 "על שרת ה-HTTP דרך http://www.yourserver.com/~user. יהיה באפשרותך להגדיר את "
 "השם של ספריה זו בהמשך."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "מודולים:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3853,7 +3848,7 @@ msgstr ""
 "אפשר למשתמשים להגדיר ספריה תחת ספריית הבית שלהם שתהיה זמינה על שרת ה-HTTP "
 "דרך http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3861,57 +3856,68 @@ msgstr ""
 "יש לקבוע את הספרייה שהמשתמשים צריכים ליצור בספריית הבית שלהם (בלי ~/) על-מנת "
 "לאפשר אליה גישה מהאינטרנט דרך http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "עליך להגדיר את שם מתחם האינטרנט המקומי."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "תת-ספריית HTTP של המשתמש: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "יש להגדיר את המסלול לספריית אחסון אתרים עליונה (document root)."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "ספריית אחסון אתרים עליונה:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "הגדרת תצורת שרת אחסון האתרים"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "האשף אסף את הנתונים הבאים הנדרשים להגדיר את שרת אחסון האתרים שלך"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "שרת אחסון אתרים עבור הרשת המקומית:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "שרת אחסון אתרים באינטרנט:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "ספריית משתמש:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "האשף סיים בהצלחה את הגדרת שרת אחסון אתרי הרשת המקומית/אינטרנט שלך"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "שרת Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "הגדרת המערכת שלך כשרת Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "הפקודה עדיין מתבצעת. האם ברצונך להפסיק את ביצועה ולצאת מהאשף?"
+
+#~ msgid "Close"
+#~ msgstr "סגור"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "שרת DNS משני"
+
 #~ msgid "Mail domain:"
 #~ msgstr "מתחם הדוא\"ל:"
 
diff --git a/po/hi.po b/po/hi.po
index fcfdf9c4..9eb85d07 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-26 07:46+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -22,8 +22,8 @@ msgstr "संरचना विज़ार्ड"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "चेतावनी ।"
 
@@ -35,17 +35,17 @@ msgstr "त्रुटि ।"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "अभिनन्दन"
 
@@ -123,42 +123,42 @@ msgid "Warning"
 msgstr "चेतावनी"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -221,17 +221,6 @@ msgstr ""
 "नहीं हो। होस्टनाम को एक एफ़क्यूडीएन होना चाहिये: पूर्ण कुशल डोमेननाम । ठीक करने के लिए "
 "ड्रैककनेक्ट को आरम्भ करें ।"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"दिया गया निर्देश अभी तक चल रहा है । क्या आप इस समाप्त करना चाहते है और विज़ार्ड से "
-"बाहर निकलना चाहते है?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "बन्द"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "डीएचसीपी जादूगरी"
@@ -319,8 +308,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "निष्क्रिय"
 
@@ -328,8 +317,8 @@ msgstr "निष्क्रिय"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "सक्रिय"
 
@@ -347,13 +336,13 @@ msgstr "जादूगरी ने डीएचसीपी सेवाओं
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "असफ़लता"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "ड्रैकविजार्ड को पुनः चलायें, और कुछ पैरामीटरों को परिवर्तित करने का प्रयास करें ।"
 
@@ -669,19 +658,24 @@ msgstr "समाचार सर्वर"
 msgid "NFS server"
 msgstr "एनएफ़एस सर्वर"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "कोलैब सर्वर"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "एफ़टीपी सर्वर"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "ड्रैकविज़ार्ड जादूगरी चयन"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "कृपया एक जादूगरी का चयन करें"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -690,7 +684,7 @@ msgstr ""
 "%s संसाधित नहीं है\n"
 "संसाधन के लिए \"अगला\" पर क्लिक करें या बाहर निकलने के लिए  \"निरस्त\" पर"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल रहा"
 
@@ -976,11 +970,6 @@ msgstr "कोलैब संरचना जादूगरी"
 msgid "Master kolab server"
 msgstr "स्वामी डीएनएस सर्वर"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "दास डीएनएस सर्वर"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1011,22 +1000,22 @@ msgstr "कोलैब ग्रूपवेयर सर्वर संरच
 msgid "Master or slave Kolab server"
 msgstr "स्वामी डीएनएस सर्वर"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "आपने पहिले से ही अपने एलडीऐपी सर्वर को संरचित कर चुके है"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "दास डीएनएस सर्वर"
@@ -1102,7 +1091,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1136,21 +1128,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "कोलैब सर्वर अब संरचित है और चल रहा है । https://127.0.0.1/kolab/admin/ पर आपके "
 "द्वारा बताये हुए कूट-शब्द को इन्टर करते हुए 'प्रबंधक' की भांति सत्र आरम्भ करें।"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "आपके तंत्र पर कोलैब सर्वर को संरचित किया जा रहा है ..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "कोलैब सर्वर"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "सॉबा जादूगरी"
@@ -1498,7 +1491,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "निर्देशिका:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "आपके द्वारा बताया हुआ पथ विधमान नहीं है।"
 
@@ -2152,7 +2145,7 @@ msgstr ""
 "करने के लिए आवश्यक है।"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3809,19 +3802,19 @@ msgstr "आपके सॉबा सर्वर को संरचित क�
 msgid "OpenSSH server"
 msgstr "आपाचे सर्वर"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "समय जादूगरी"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "पुनः प्रयास करें"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "संरचना को बिना परीक्षण के सुरक्षित करें"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3829,15 +3822,15 @@ msgstr ""
 "यह जादूगरी आपकी सहायता आपके सर्वर के समय को एक बाह्य समय सर्वर के साथ समतुल्य करने में "
 "सहायता करेगी।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "इस प्रकार से आपका सर्वर आपके नेटवर्क के लिए एक स्थानीय सर्वर होगा।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "आरम्भ करने के लिए अगला को दबायें, या निरस्त को इस जादूगरी को छोड़ने के लिए"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3845,35 +3838,35 @@ msgstr ""
 "(हम संस्तुति करते है कि आप सर्वर pool.ntp.org का उपयोग दो बार करें क्योंकि यह सर्वर "
 "बेतरतीबी से उपलब्ध समय सर्वरों की तरह इंगित करता है)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "एक प्राथमिक और द्वितीय सर्वर का सूची में से चयन करें।"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "अनेक समय सर्वर"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "प्राथमिक समय सर्वर:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "द्वितीय समय सर्वर:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "एक समय मंडल का चयन करें"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "एक क्षेत्र का चयन करें:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "एक देश का चयन करें:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3881,35 +3874,35 @@ msgstr ""
 "यदि समय सर्वर तत्काल उपलब्ध नहीं होता है (नेटवर्क या अन्य कारण),तब एक ३० सेकंड का "
 "विलम्ब होगा।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "समय सर्वरों के परीक्षण को आरम्भ करने के लिए अगला को दबायें।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "समय सर्वरों की उपलब्धता का परीक्षण किया जा रहा है"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "समय मंडल:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "समय सर्वर उत्तर नहीं दे रहे है। इसके कारण हो सकते है:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- अविद्यमान समय सर्वर"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- कोई बाह्य नेटवर्क नहीं"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- अन्य कारण..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3917,11 +3910,11 @@ msgstr ""
 "- आप समय सर्वरों से संबध स्थापित करने के लिए पुनः प्रयास कर सकते है, या बिना वास्तव में "
 "समय को स्थापित किये हुए संरचना को सुरक्षित कर सकते है ।"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "समय सर्वर संरचना सुरक्षित की गई"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "आपका सर्वर आपके स्थानीय नेटवर्क के लिए अब एक समय सर्वर की भांति व्यवहार कर सकता है।"
@@ -3964,15 +3957,15 @@ msgstr ""
 "आपका सर्वर आपके आंतरिक नेटवर्क (इन्ट्रानेट) की तरफ़ एक वेब सर्वर की भांति औरइन्टरनेट के "
 "लिए , एक वेब सर्वर की तरह व्यवहार कर सकता है।"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "इन्ट्रानेट के लिए वेब सर्वर को सक्रिय करें"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "वेब सर्वर को इन्टरनेट के लिए सक्रिय करें"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3982,11 +3975,11 @@ msgstr ""
 "निर्देशिका कोउनकी गृह निर्देशिकाओं में जो कि आपके एचटीटीपी सर्वर पर उपलब्ध है, रखने की "
 "अनुमति दी जाती है,आपसे इस निर्देशिका का नाम इसके बाद पूछा जायेगा ।"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "मॉडयूल:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3995,7 +3988,7 @@ msgstr ""
 "http://www.yourserver.com/~user के द्वारा आपके एचटीटीपी सर्वर पर उपयोगकर्ताओं को\n"
 "एक निर्देशिका को उनकी गृह निर्देशिकाओं में प्राप्त करने की अनुमति । "
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4003,28 +3996,28 @@ msgstr ""
 "उस निर्देशिका का नाम बतायें जिसे उपयोगकर्ताओं को उनके गृहों में (बिना ~/)http://www."
 "yourserver.com/~user द्वारा उपलब्ध करने हेतु निर्माण करना चाहिए"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "आपको एक ओपेन एलडीऐपी सर्वर को सबसे पहिले स्थापित करना चाहिये ।"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "उपयोगकर्ता एचटीटीपी उप-निर्देशिका: ~/ "
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "उस निर्देशिका का पथ बतायें जिसे आप प्रलेख के मूलरूप में रखना चाहते है।"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "प्रलेख का मूल:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "वेब सर्वर की संरचना की जा रही है"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4032,30 +4025,43 @@ msgstr ""
 "इस जादूगरी ने आपके वेब सर्वर को संरचित करने में आवश्यक निम्नलिखित मानकों कोएकत्रित कर "
 "लिया है।"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "इन्ट्रानेट वेब सर्वर:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "इन्टरनेट वेब सर्वर:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "उपयोगकर्ता निर्देशिका:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट वेब सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "आपाचे सर्वर"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "आपके तंत्र को एक आपाचे सर्वर की भांति संरचित किया जा रहा है ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "दिया गया निर्देश अभी तक चल रहा है । क्या आप इस समाप्त करना चाहते है और विज़ार्ड से "
+#~ "बाहर निकलना चाहते है?"
+
+#~ msgid "Close"
+#~ msgstr "बन्द"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "दास डीएनएस सर्वर"
+
 #~ msgid "Mail domain:"
 #~ msgstr "विपत्र डोमेन:"
 
diff --git a/po/hr.po b/po/hr.po
index b8d85fa8..2751df99 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -22,8 +22,8 @@ msgstr "Čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Upozorenje."
 
@@ -35,17 +35,17 @@ msgstr "Greška."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Čestitamo"
 
@@ -120,42 +120,42 @@ msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Greška"
 
@@ -212,15 +212,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zatvori"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak "
@@ -304,8 +295,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "onemogućeno"
 
@@ -313,8 +304,8 @@ msgstr "onemogućeno"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "uključen"
 
@@ -332,13 +323,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Nije uspjelo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -628,19 +619,24 @@ msgstr ""
 msgid "NFS server"
 msgstr ""
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr ""
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP Poslužitelj"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard selekcija čarobnjaka"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Odaberite čarobnjaka"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -649,7 +645,7 @@ msgstr ""
 "%s nije instaliraj\n"
 "Kliknite \"Slijedeći\" da instalira ili \"Odustani\" da odustanete"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
@@ -904,11 +900,6 @@ msgstr ""
 msgid "Master kolab server"
 msgstr "PXE server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "PXE server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -932,21 +923,21 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "PXE server"
@@ -1019,7 +1010,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1052,17 +1046,17 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
-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/"
+msgid "Done"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Configuring Kolab server on your system..."
+#: ../kolab_wizard/Kolab.pm:219
+msgid ""
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
+msgid "Configuring Kolab server on your system..."
 msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:32
@@ -1397,7 +1391,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorij:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Putanja koju ste unijeli ne postoji. "
 
@@ -2005,7 +1999,7 @@ msgstr ""
 "proxy-a: "
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3582,19 +3576,19 @@ msgstr ""
 msgid "OpenSSH server"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Čarobnjak za vrijeme"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Spremi postavke bez testa"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3602,50 +3596,50 @@ msgstr ""
 "Ovaj čarobnjak će pomoći da podesite sinkronizaciju vremena vašeg "
 "poslužitelja sa vanjskim vremenskim poslužiteljem."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Dakle vaš će poslužitelj biti lokalni vremenski poslužitelj za vašu mrežu."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Pritisnite Dalje da počnete, ili Odustani da napustite ovog čarobnjaka"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Odaberi primarni i sekundarni poslužitelj sa liste"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3653,45 +3647,45 @@ msgstr ""
 "Ako poslužitelj za vrijeme nije odmah dostupan (mreža ili neki drugi razlog) "
 "biti će zakašnjenje od oko 30 sekundi. "
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Pritisnite dalje da pokrente testiranje vremenskih poslužitelja."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testiranje dostupnosti poslužitelja vremena"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Vremenska zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Vremenski poslužitelji se ne odazivaju. Mogući razlozi su: "
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ne postojeći poslužitelji vremena"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nema vanjske mreže"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- drugi razlozi..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfiguracija vremenskog poslužitelja spremljena"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Vaš poslužitelj sada može glumiti vremenski poslužitelj za vašu lokalnu mrežu"
@@ -3731,88 +3725,95 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Unesite putanju mape koja će se koristiti za korijen strukture dokumenta."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Korijenska mapa dokumenta: "
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet web poslužitelj:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet web poslužitelj"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Mapa korisnika:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "PXE server"
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/hu.po b/po/hu.po
index 73d1f670..ed2a8b7d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-07 23:27+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -27,8 +27,8 @@ msgstr "beállításvarázsló"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Figyelmeztetés"
 
@@ -40,17 +40,17 @@ msgstr "Hiba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulálunk"
 
@@ -86,7 +86,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Ez a varázsló segítséget nyújt egy kliens helyi DNS-be való felvételéhez."
+msgstr ""
+"Ez a varázsló segítséget nyújt egy kliens helyi DNS-be való felvételéhez."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -100,7 +101,8 @@ msgstr "A kliens azonosítása:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "A megadott IP-címnek és kliensnévnek egyedinek kell lenni a hálózaton belül."
+msgstr ""
+"A megadott IP-címnek és kliensnévnek egyedinek kell lenni a hálózaton belül."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
@@ -127,44 +129,44 @@ msgid "Warning"
 msgstr "Figyelmeztetés"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Jelenleg DHCP-módban van, ezért elképzelhető, hogy a 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Hiba"
 
@@ -227,16 +229,6 @@ msgstr ""
 "kell megadni a gépnévnél. A beállításához használja a \"drakconnect\" "
 "programot."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"A program még végrehajtás alatt áll. Szeretné leállítani azt, és kilépni a "
-"varázslóból?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Bezárás"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP-varázsló"
@@ -327,8 +319,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "kikapcsolva"
 
@@ -336,8 +328,8 @@ msgstr "kikapcsolva"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "bekapcsolva"
 
@@ -355,15 +347,16 @@ msgstr "A varázsló beállította a DHCP-szolgáltatásokat."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Sikertelen"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
@@ -506,7 +499,8 @@ msgid "Default domain name to search:"
 msgstr "Az alapértelmezésben keresendő tartománynév:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Érvénytelen IP-cím a továbbító számára. A folytatáshoz nyomja le a "
 "\"Következő\" gombot."
@@ -551,7 +545,8 @@ msgstr ""
 "varázsló \"Elsődleges DNS-kiszolgáló\" funkcióját."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Úgy tűnik, a gép nem elsődleges DNS-kiszolgáló, ezért a gép felvétele/"
 "eltávolítása nem lehetséges."
@@ -581,7 +576,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Az itt megadott azonosítású kliens el lesz távolítva a DNS-ből"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "A DNS-kiszolgáló a következő módon lesz beállítva:"
 
 #: ../dns_wizard/Bind.pm:245
@@ -606,7 +602,8 @@ msgstr "A varázsló beállította a kiszolgáló DNS-szolgáltatását."
 
 #: ../dns_wizard/Bind.pm:275 ../installsrv_wizard/Installsrv.pm:107
 msgid "Please Relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
@@ -677,19 +674,24 @@ msgstr "Hírkiszolgáló"
 msgid "NFS server"
 msgstr "NFS-kiszolgáló"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-kiszolgáló"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-kiszolgáló"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard varázslóválasztás"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Válasszon egy varázslót"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -698,7 +700,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:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
@@ -791,7 +793,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "Allow FXP: allow file transfer via another FTP."
-msgstr "FXP engedélyezése: fájlátvitel engedélyezése egy másik FTP-n keresztül."
+msgstr ""
+"FXP engedélyezése: fájlátvitel engedélyezése egy másik FTP-n keresztül."
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "Chroot home user: users will only see their home directory."
@@ -886,14 +889,16 @@ msgstr "A varázsló beállította az intranetes/internetes FTP-kiszolgálót."
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
 #: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
+msgstr ""
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
 #: ../installsrv_wizard/Installsrv.pm:54
 msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Telepítési kiszolgáló beállítása (NFS-en és HTTP-n keresztül)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr "Kiszolgáló-telepítési könyvtár beállítása NFS- és HTTP-eléréssel."
 
 #: ../installsrv_wizard/Installsrv.pm:59
@@ -977,10 +982,6 @@ msgstr "Kolab-beállításvarázsló"
 msgid "Master kolab server"
 msgstr "Elsődleges Kolab-kiszolgáló"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Másodlagos Kolab-kiszolgáló"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1011,23 +1012,24 @@ msgstr "Üdvözli a Kolab csoportmunka-kiszolgáló beállítási varázslója."
 msgid "Master or slave Kolab server"
 msgstr "Elsődleges vagy másodlagos Kolab-kiszolgáló"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Válasszon elsődleges Kolab-kiszolgálót"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
-"Adja meg a másodlagos Kolab-kiszolgáló teljes gépnevét - például \"gép.tartomány.com\" "
-"(ha nincs, akkor hagyja üresen)."
+"Adja meg a másodlagos Kolab-kiszolgáló teljes gépnevét - például \"gép."
+"tartomány.com\" (ha nincs, akkor hagyja üresen)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
-msgstr "Azt a lehetőséget választotta, hogy beállít egy elsődleges Kolab-kiszolgálót."
+msgstr ""
+"Azt a lehetőséget választotta, hogy beállít egy elsődleges Kolab-kiszolgálót."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Másodlagos Kolab-kiszolgáló:"
 
@@ -1041,9 +1043,9 @@ msgid ""
 "FQDN from above. Kolab primary email addresses will be of the type "
 "user@yourdomain"
 msgstr ""
-"Adja meg a levelezési tartományát. Ha nincs erről információja, akkor használja "
-"a fentebbi teljes gépnevet. A Kolab elsődleges email-címeinek formája a következő lesz: "
-"felhasználó@tartomány"
+"Adja meg a levelezési tartományát. Ha nincs erről információja, akkor "
+"használja a fentebbi teljes gépnevet. A Kolab elsődleges email-címeinek "
+"formája a következő lesz: felhasználó@tartomány"
 
 #: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
 #: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
@@ -1106,10 +1108,15 @@ msgstr ""
 "Hitelesítésszolgáltató és tanúsítvány"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
-"Adja meg a hitelesítésszolgáltatóhoz kapcsolódó és az "
-"RSA-kulcshoz kapcsolódó jelszó-kifejezést."
+"A Kolab segítségével létrehozható (és kezelhető) egy hitelesítésszolgáltató. "
+"Ez utóbbival SSL-tanúsítványok hozhatók létre a Kolab-környezetben való "
+"használatra."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1141,22 +1148,23 @@ msgid "With CA"
 msgstr "Hitelesítésszolgáltatóval"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "A Kolab-kiszolgáló be van állítva és fut. A megadott jelszóval be lehet "
 "jelentkezni 'manager' (rendszergazda) felhasználóként a \"https://127.0.0.1/"
 "kolab/admin/\" címen."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "A Kolab-kiszolgáló beállítása a rendszeren..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-kiszolgáló"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP-varázsló"
@@ -1469,7 +1477,8 @@ msgid "Polling interval:"
 msgstr "Lekérdezési intervallum:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "A varázsló beállította a kiszolgáló internetes hírszolgáltatását."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1508,7 +1517,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Könyvtár:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "A megadott útvonal nem létezik."
 
@@ -1662,7 +1671,8 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "Configuring your system to be a NIS server with Autofs map..."
-msgstr "A rendszer beállítása Autofs-összerendeléssel rendelkező NIS-kiszolgálónak..."
+msgstr ""
+"A rendszer beállítása Autofs-összerendeléssel rendelkező NIS-kiszolgálónak..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "NIS with Autofs map"
@@ -1788,7 +1798,8 @@ msgid "Main Postfix server"
 msgstr "Fő Postfix-kiszolgáló"
 
 #: ../postfix_wizard/Postfix.pm:172
-msgid "Verify command: this stops some techniques used to harvest email addresses."
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
 msgstr ""
 "Ellenőrzési parancs: megakadályozza bizonyos levélcím-gyűjtési módszerek "
 "használatát."
@@ -1898,7 +1909,8 @@ msgstr "cél:"
 
 #: ../postfix_wizard/Postfix.pm:217
 msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
-msgstr "A megbízható SMTP-kliensek listája, például: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+"A megbízható SMTP-kliensek listája, például: 127.0.0.0/32, 192.168.1.0/24"
 
 #: ../postfix_wizard/Postfix.pm:217 ../postfix_wizard/Postfix.pm:262
 msgid "my networks:"
@@ -2045,14 +2057,16 @@ msgid "Proxy port:"
 msgstr "Proxy-port:"
 
 #: ../proxy_wizard/Squid.pm:88
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Az érték megtartásához nyomja le a \"Következő\" gombot; javításhoz az "
 "\"Előző\" gombot."
 
 #: ../proxy_wizard/Squid.pm:88
 msgid "You have entered a port that may be useful for this service:"
-msgstr "Egy olyan portot adott meg, amely hasznos lehet ennek a szolgáltatásnak:"
+msgstr ""
+"Egy olyan portot adott meg, amely hasznos lehet ennek a szolgáltatásnak:"
 
 #: ../proxy_wizard/Squid.pm:95
 msgid "Press back to change the value."
@@ -2063,7 +2077,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "A portszámnak 1024-nél nagyobbnak kell lenni és 65535-nél kisebbnek"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "A lemezes gyorstár azt a lemezhely-mennyiséget jelöli, amely a lemezen való "
 "gyorstárazáshoz felhasználható."
@@ -2170,13 +2185,14 @@ msgid "Configuring the Proxy"
 msgstr "A proxy beállítása"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "A varázsló a következő, a proxy beállításához szükséges paramétereket "
 "gyűjtötte össze:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2284,7 +2300,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
-msgstr "A képmás helye: adja meg a hálózati rendszerindítási képmás teljes útvonalát"
+msgstr ""
+"A képmás helye: adja meg a hálózati rendszerindítási képmás teljes útvonalát"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2328,8 +2345,10 @@ msgstr ""
 "kiválaszthatja, melyik PXE-képmással akarja indítani a rendszert."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
-msgstr "Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+"Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Remove a boot image"
@@ -2359,7 +2378,8 @@ msgstr ""
 "paraméterekkel való testreszabásához."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr "Válassza ki a listából a módosítandó rendszerindítási PXE-képmást"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2371,7 +2391,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Opció felvétele a PXE-képmáshoz"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
 msgstr ""
 "Telepítési könyvtár: a Mandriva Linux-telepítési kiszolgáló könyvtárának "
 "teljes útvonala"
@@ -2409,7 +2430,8 @@ msgstr "ACPI opció: Advanced Configuration and Power Interface"
 msgid ""
 "Network client interface: the network interface used for the installation "
 "process."
-msgstr "Hálózati kliensfelület: a telepítési folyamathoz használt hálózati felület."
+msgstr ""
+"Hálózati kliensfelület: a telepítési folyamathoz használt hálózati felület."
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "Ramsize: adjust the ramsize parameter on boot image."
@@ -2473,7 +2495,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Szükség van egy all.rdz vagy egy network.img képmásra. Vegyen fel egyet."
+msgstr ""
+"Szükség van egy all.rdz vagy egy network.img képmásra. Vegyen fel egyet."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2494,10 +2517,12 @@ msgstr "Válasszon képmást egy ettől eltérő könyvtárból: %s."
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Adjon meg egy érvényes PXE-nevet: egy ASCII szó vagy egy szám, szóköz nélkül."
+msgstr ""
+"Adjon meg egy érvényes PXE-nevet: egy ASCII szó vagy egy szám, szóköz nélkül."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Egy rendszerindítási PXE-képmás felvételéhez, eltávolításához illetve "
 "módosításához előbb végre kell hajtani a \"PXE-kiszolgáló beállítása\" "
@@ -2535,7 +2560,8 @@ msgstr "PXE-segítségfájl:"
 
 #: ../pxe_wizard/Pxe.pm:248
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "A varázsló módosítja a rendszerindítási opciókat ezekkel a paraméterekkel:"
+msgstr ""
+"A varázsló módosítja a rendszerindítási opciókat ezekkel a paraméterekkel:"
 
 #: ../pxe_wizard/Pxe.pm:265
 msgid "The wizard will now remove this PXE boot image"
@@ -2617,7 +2643,8 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
@@ -2848,7 +2875,8 @@ msgstr "A jelszavak nem egyeznek"
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "A Sambának tudnia kell, melyik windowsos munkacsoportot fogja kiszolgálni."
+msgstr ""
+"A Sambának tudnia kell, melyik windowsos munkacsoportot fogja kiszolgálni."
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Workgroup"
@@ -2980,7 +3008,8 @@ msgstr ""
 
 #: ../samba_wizard/Sambaprint.pm:86
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Válassza ki, mely nyomtatók legyenek elérhetők az ismert felhasználók által"
+msgstr ""
+"Válassza ki, mely nyomtatók legyenek elérhetők az ismert felhasználók által"
 
 #: ../samba_wizard/Sambaprint.pm:92
 msgid "Enable all printers"
@@ -3120,7 +3149,8 @@ msgstr ""
 #: ../samba_wizard/Sambashare.pm:172
 #, fuzzy
 msgid "Please choose the share you want to remove."
-msgstr "Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
+msgstr ""
+"Válassza ki a PXE-kiszolgálóról eltávolítandó rendszerindítási PXE-képmást."
 
 #: ../samba_wizard/Sambashare.pm:180
 msgid "Modify which share?"
@@ -3164,7 +3194,8 @@ msgstr "Könyvtár:"
 
 #: ../samba_wizard/Sambashare.pm:210
 #, fuzzy
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr "Hiba - könyvtárt kell megadni."
 
 #: ../samba_wizard/Sambashare.pm:217
@@ -3851,19 +3882,19 @@ msgstr "Az OpenSSH-kiszolgáló beállítása..."
 msgid "OpenSSH server"
 msgstr "OpenSSH-kiszolgáló"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Idővarázsló"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Próbálja meg újra"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Beállítások mentése tesztelés nélkül"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3871,17 +3902,17 @@ msgstr ""
 "Ez a varázsló segítséget nyújt a kiszolgáló időbeállításához - egy külső "
 "időkiszolgálóval szinkronizálva."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Az Ön kiszolgálója lesz a hálózat helyi időkiszolgálója."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Indításhoz nyomja le a \"Következő\" gombot; a varázslóból való kilépéshez a "
 "\"Mégsem\" gombot."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3889,35 +3920,35 @@ msgstr ""
 "(javasolt a pool.ntp.org kiszolgáló kétszeri használata, mivel ez a "
 "kiszolgáló véletlenszerűen mutat az elérhető időkiszolgálókra)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Válasszon egy elsődleges és egy másodlagos kiszolgálót a listából."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Időkiszolgálók"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Az elsődleges időkiszolgáló:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "A másodlagos időkiszolgáló:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Válasszon egy időzónát"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Válasszon egy területet:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Válasszon egy várost:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3925,35 +3956,35 @@ msgstr ""
 "Ha az időkiszolgáló nem érhető el azonnal (hálózati vagy egyéb okok miatt), "
 "akkor körülbelül 30 másodpercnyi várakozásra lesz szükség."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Az időkiszolgálók teszteléséhez nyomja le a \"Következő\" gombot."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Az időkiszolgálók elérhetőségének tesztelése"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Időzóna:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Az időkiszolgálók nem válaszolnak. Ennek okai a következők lehetnek:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- nem létező időkiszolgálók"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nincs külső hálózat"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- egyéb okok..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3961,11 +3992,11 @@ msgstr ""
 "- Ismételten megpróbálkozhat az időkiszolgálók elérésével; vagy pedig "
 "elmentheti a beállításokat anélkül, hogy az idő beállításra kerülne."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Időkiszolgáló-beállítások elmentve."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Az Ön kiszolgálója mostantól időkiszolgálóként működhet a helyi hálózat "
@@ -3990,7 +4021,8 @@ msgstr "Webkiszolgáló-beállítási varázsló"
 
 #: ../web_wizard/Apache.pm:78
 msgid "Don't check any box if you don't want to activate your Web server."
-msgstr "Ha nem kívánja aktiválni a webkiszolgálót, ne jelölje ki egyik opciót sem."
+msgstr ""
+"Ha nem kívánja aktiválni a webkiszolgálót, ne jelölje ki egyik opciót sem."
 
 #: ../web_wizard/Apache.pm:78
 msgid "Select the kind of Web service you want to activate:"
@@ -4008,15 +4040,15 @@ msgstr ""
 "Az Ön kiszolgálója nyújthat webes szolgáltatásokat a belső hálózat "
 "(intranet) felé és az internet felé is."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "A webkiszolgáló intranetes elérésének lehetővé tétele"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "A webkiszolgáló internetes elérésének lehetővé tétele"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4027,11 +4059,11 @@ msgstr ""
 "kiszolgálóján keresztül a http://www.kiszolgalo.com/~felhasznalo címen. "
 "Ehhez meg kell adni a szóban forgó könyvtár nevét."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modulok:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4040,7 +4072,7 @@ msgstr ""
 "valamelyik könyvtárt elérhetővé tegyék a gép HTTP-kiszolgálóján keresztül a "
 "http://www.kiszolgáló.com/~felhasználó címen."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4049,29 +4081,29 @@ msgstr ""
 "hozniuk egy könyvtárt a saját könyvtárukban, ha elérhetővé kívánnak tenni "
 "adatokat a http://www.kiszolgalo.com/~felhasznalo címen"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Meg kell adni egy felhasználói könyvtárt."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "felhasználói HTTP-alkönyvtár: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Adja meg azon könyvtár útvonalát, amelyik könyvtárt dokumentumgyökérként "
 "szeretné használni."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumentumgyökér:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "A webkiszolgáló beállítása"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4079,27 +4111,43 @@ msgstr ""
 "A varázsló a következő, a webkiszolgáló beállításához szükséges "
 "paramétereket gyűjtötte össze:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranetes webkiszolgáló:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internetes webkiszolgáló:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Felhasználói könyvtár:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "A varázsló beállította az intranetes/internetes webkiszolgálót."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache-kiszolgáló"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "A program még végrehajtás alatt áll. Szeretné leállítani azt, és kilépni "
+#~ "a varázslóból?"
+
+#~ msgid "Close"
+#~ msgstr "Bezárás"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Másodlagos Kolab-kiszolgáló"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr ""
+#~ "Adja meg a hitelesítésszolgáltatóhoz kapcsolódó és az RSA-kulcshoz "
+#~ "kapcsolódó jelszó-kifejezést."
diff --git a/po/id.po b/po/id.po
index 6bec691a..db7ecec8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-06 09:20+0700\n"
 "Last-Translator: Sofian Hanafi <sofianhanafi@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -27,8 +27,8 @@ msgstr "wizard konfigurasi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Peringatan."
 
@@ -40,17 +40,17 @@ msgstr "Kesalahan."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Selamat"
 
@@ -127,44 +127,44 @@ msgid "Warning"
 msgstr "Peringatan"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Anda berada dalam dhcp, server mungkin tidak berjalan dengan konfigurasi "
 "Anda."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -227,17 +227,6 @@ msgstr ""
 "Hostname harus FQDN: Fully Qualified Domain Name. Jalankan drakconnect untuk "
 "mengaturnya."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Perintah masih berjalan. Apakah Anda ingin menghentikan dan keluar dari "
-"Wizard?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Tutup"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Wizard DHCP"
@@ -327,8 +316,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "tidak aktif"
 
@@ -336,8 +325,8 @@ msgstr "tidak aktif"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aktif"
 
@@ -355,13 +344,13 @@ msgstr "Wizard berhasil mengkonfigurasi layanan DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Gagal"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Jalankan ulang drakwizard, dan coba ubah beberapa parameter."
 
@@ -677,19 +666,24 @@ msgstr "Server Berita"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Server Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Pilihan wizard drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Silakan memilih wizard"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -698,7 +692,7 @@ msgstr ""
 "%s tidak terinstall\n"
 "Klik \"Berikutnya\" untuk menginstal atau \"Batal\" untuk keluar"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
@@ -973,10 +967,6 @@ msgstr "Wizard konfigurasi Kolab"
 msgid "Master kolab server"
 msgstr "Server kolab master"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Server kolab Slave"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1006,11 +996,11 @@ msgstr "Selamat datang ke Wizard konfigurasi server Groupware Kolab."
 msgid "Master or slave Kolab server"
 msgstr "Server Kolab Master atau Slave"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Anda memilih sebuah server Kolab Master"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
@@ -1018,11 +1008,11 @@ msgstr ""
 "Masukkan nama host yang lengkap untuk server kolab slave misalnya thishost."
 "domain.tld (biarkan kosong jika tidak ada)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Anda memilih untuk mengkonfigurasi sebuah server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Server kolab slave:"
 
@@ -1100,8 +1090,15 @@ msgstr ""
 "sertifikat untuk server CA Kolab dan sertifikat"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Masukkan passphrase untuk CA, dan passphrase untuk kunci RSA."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab dapat membuat dan mengelola sebuah sertifikat otoritas yang dapat "
+"digunakan untuk membuat sertifikat SSL untuk digunakan didalam lingkungan "
+"Kolab."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1133,21 +1130,22 @@ msgid "With CA"
 msgstr "Dengan CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Server kolab terkonfigurasi dan berjalan. Login sebagai 'manager' dengan "
 "katasandi yang Anda masukkan pada https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Mengkonfigurasi server Kolab pada sistem Anda..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Server Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Wizard LDAP"
@@ -1496,7 +1494,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Path yang Anda masukkan tidak ada."
 
@@ -2161,7 +2159,7 @@ msgstr ""
 "mengkonfigurasikan proxy Anda:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2818,7 +2816,8 @@ msgid ""
 "parameter is not specified, the value from ldap suffix will be used."
 msgstr ""
 "Parameter ini menentukan dimana pengguna ditambahkan pada pohon. Jika "
-"parameter ini tidak ditentukan, nilai berasal dari suffix ldap akan digunakan."
+"parameter ini tidak ditentukan, nilai berasal dari suffix ldap akan "
+"digunakan."
 
 #: ../samba_wizard/Samba.pm:262
 msgid "LDAP group suffix:"
@@ -3856,19 +3855,19 @@ msgstr "Mengkonfigurasi server OpenSSH Anda..."
 msgid "OpenSSH server"
 msgstr "Server OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Wizard waktu"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Coba lagi"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Simpan konfigurasi tanpa pengujian"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3876,16 +3875,16 @@ msgstr ""
 "Wizard ini akan membantu menentukan jam server Anda tersinkron dengan server "
 "waktu eksternal."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Sehingga server Anda akan jadi server waktu lokal jaringan Anda."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "tekan berikutnya untuk mulai, atau batal untuk  meninggalkan wizard ini."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3893,35 +3892,35 @@ msgstr ""
 "(kami merekomendasikan menggunakan server pool.ntp.org dua kali karena "
 "server ini secara acak menunjuk pada server waktu yang ada)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Pilih server primer dan sekunder dari daftar."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Server Waktu"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Server Waktu Primer:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Server Waktu Sekunder:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Pilih zona waktu:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Pilih wilayah:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Pilih kota:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3929,35 +3928,35 @@ msgstr ""
 "Jika server waktu tidak tersedia segera (jaringan atau alasan lain), akan "
 "terdapat jeda sekitar 30 detik."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Tekan berikutnya untuk memulai pengujian server waktu."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Pengujian kesediaan server waktu"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zona waktu:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Server waktu tidak bereaksi. Penyebabnya mungkin:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- server waktu tidak ada"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- tidak ada jaringan keluar"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- alasan lain..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3965,11 +3964,11 @@ msgstr ""
 "Anda bisa mencoba menghubungi lagi server waktu, atau menyimpan konfigurasi "
 "tanpa menentukan waktu aktual."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfigurasi server waktu telah disimpan"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Server Anda kini dapat berperan sebagai server waktu jaringan lokal Anda."
@@ -4012,15 +4011,15 @@ msgstr ""
 "Server Anda dapat berperan sebagai Server Web untuk jaringan internal "
 "(intranet) dan server Web untuk Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Aktifkan Server Web untuk Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Aktifkan Server Web untuk Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4030,11 +4029,11 @@ msgstr ""
 "server http via http://www.serverAnda.com/~user, Anda akan ditanya tentang "
 "nama direktori ini."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modul:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4042,7 +4041,7 @@ msgstr ""
 "Ijinkan pengguna untuk menampilkan direktori home mereka melalui server http "
 "via http://www.serverAnda.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4050,27 +4049,27 @@ msgstr ""
 "Tuliskan nama direktori yang harus dibuat oleh pengguna di home mereka "
 "(tanpa ~/) agar tersedia via http://www.serverAnda.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Anda harus menentukan direktori pengguna."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Sub-direktori http pengguna: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ketikkan path direktori yang ingin dijadikan root dokumen."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Root dokumen:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Mengkonfigurasi Server Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4078,30 +4077,45 @@ msgstr ""
 "Wizard mengumpulkan parameter berikut yang diperlukan untuk mengkonfigurasi "
 "server Web Anda"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Server web intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Server web Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Direktori pengguna:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Wizard berhasil mengkonfigurasi server Web Intranet/Internet Anda"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Server Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Mengkonfigurasi sistem Anda sebagai server Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Perintah masih berjalan. Apakah Anda ingin menghentikan dan keluar dari "
+#~ "Wizard?"
+
+#~ msgid "Close"
+#~ msgstr "Tutup"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Server kolab Slave"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr "Masukkan passphrase untuk CA, dan passphrase untuk kunci RSA."
+
 #~ msgid "Mail domain:"
 #~ msgstr "Domain Mail:"
 
diff --git a/po/is.po b/po/is.po
index 8a7ad89f..553d481c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-07 20:29+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -22,8 +22,8 @@ msgstr "stillingarráðgjafi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Aðvörun."
 
@@ -35,17 +35,17 @@ msgstr "Villa."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Til hamingju"
 
@@ -61,11 +61,13 @@ msgstr "Þú verður fyrst að keyra DNS miðlararáðgjafann"
 msgid ""
 "A client of your local network is a machine connected to the network having "
 "its own name and IP address."
-msgstr "Biðlari á þínu staðarneti er tengdur netinu með sínu eigin nafni og IP tölu."
+msgstr ""
+"Biðlari á þínu staðarneti er tengdur netinu með sínu eigin nafni og IP tölu."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Ýttu á \"Næsta\" til að byrja, eða \"Hætta við\" til að stöðva ráðgjafann."
+msgstr ""
+"Ýttu á \"Næsta\" til að byrja, eða \"Hætta við\" til að stöðva ráðgjafann."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -120,42 +122,42 @@ msgid "Warning"
 msgstr "Aðvörun"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Þú ert í dhcp, miðlari mun kannski ekki virka með þinni uppsetningu."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Villa"
 
@@ -217,14 +219,6 @@ msgstr ""
 "hafa rétt lénsnafn, ekki sett sem localdomain eða autt. Vélarnafn verður að "
 "vera fullformað vélarnafn með léni. Ræstu drakconnect til að stilla það."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Skipunin er enn keyrandi. Viltu stöðva hana og hætta í ráðgjafanum?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Loka"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Ráðgjafi"
@@ -233,11 +227,13 @@ msgstr "DHCP Ráðgjafi"
 msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
-msgstr "DHCP er þjónusta sem úthlutar sjálfvirkt netföngum á vinnustöðvarnar þínar."
+msgstr ""
+"DHCP er þjónusta sem úthlutar sjálfvirkt netföngum á vinnustöðvarnar þínar."
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Þessi ráðgjafi mun hjálpa þér við að stilla DHCP þjónustur á þínum miðlara."
+msgstr ""
+"Þessi ráðgjafi mun hjálpa þér við að stilla DHCP þjónustur á þínum miðlara."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
@@ -311,8 +307,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "óvirkt"
 
@@ -320,8 +316,8 @@ msgstr "óvirkt"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "virkt"
 
@@ -339,13 +335,13 @@ msgstr "Ráðgjafinn hefur stillt DHCP þjónusturnar."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Mistókst"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Endurræstu drakwizard, og reyndu að breyta einhverjum gildum."
 
@@ -486,7 +482,8 @@ msgid "Default domain name to search:"
 msgstr "Sjálfgefin lénsnöfn sem á að leita í:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Þetta er ekki gild IP-tala fyrir framsendingar... Smellið á \"Næsta\" til að "
 "halda áfram"
@@ -531,7 +528,8 @@ msgstr ""
 "Vinsamlega keyrið DNS ráðgjafann: Aðal-DNS nafnamiðlari."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Það lítur út fyrir að þetta sé ekki aðal DNS nafnamiðlari, svo ég get ekki "
 "bætt við né fjarlægt vélar."
@@ -561,7 +559,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Biðlari með þetta auðkenni verður fjarlægður úr þínu DNS"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "DNS nafna-miðlarinn verður nú settur upp meðeftirfarandi stillingum"
 
 #: ../dns_wizard/Bind.pm:245
@@ -582,7 +581,8 @@ msgstr "Ráðgjafinn fjarlægði vélina úr þínum nafnamiðlara (DNS)."
 
 #: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
-msgstr "Ráðgjafinn hefur nú sett upp DNS nafnamiðlunar-þjónustu á þínum miðlara."
+msgstr ""
+"Ráðgjafinn hefur nú sett upp DNS nafnamiðlunar-þjónustu á þínum miðlara."
 
 #: ../dns_wizard/Bind.pm:275 ../installsrv_wizard/Installsrv.pm:107
 msgid "Please Relaunch drakwizard, and try to change some parameters."
@@ -657,19 +657,24 @@ msgstr "Fréttamiðlari"
 msgid "NFS server"
 msgstr "NFS miðlari"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab miðlari"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP miðlari"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard ráðgjafaval"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Vinsamlega veljið ráðgjafa"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -678,7 +683,7 @@ msgstr ""
 "%s er ekki sett(ur) upp\n"
 "Smelltu á \"Næsta\" til að setja upp, eða \"Hætta við\" til að stöðva"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Uppsetning mistókst"
 
@@ -692,7 +697,8 @@ msgstr "Stillingarráðgjafi FTP miðlara"
 
 #: ../ftp_wizard/Proftpd.pm:78
 msgid "This wizard will help you configuring an FTP server for your network."
-msgstr "Þessi ráðgjafi hjálpar þér við að setja upp FTP miðlara fyrir þitt net."
+msgstr ""
+"Þessi ráðgjafi hjálpar þér við að setja upp FTP miðlara fyrir þitt net."
 
 #: ../ftp_wizard/Proftpd.pm:84
 msgid "Select the kind of FTP service you want to activate:"
@@ -865,7 +871,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Setja upp uppsetningar-miðlara (um NFS og http)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr "Setja upp uppsetningar-möppur miðlara, með NFS og HTTP aðgangi."
 
 #: ../installsrv_wizard/Installsrv.pm:59
@@ -904,7 +911,8 @@ msgstr "nota t.d.: /var/install/mdk-útgáfa"
 msgid ""
 "Error, the source path must be a directory with full Linux installation "
 "directory."
-msgstr "Villa, upprunaslóð verður að vera mappa með allri Linux uppsetningunni."
+msgstr ""
+"Villa, upprunaslóð verður að vera mappa með allri Linux uppsetningunni."
 
 #: ../installsrv_wizard/Installsrv.pm:82
 msgid "The destination directory is already in use. Please choose another one."
@@ -946,10 +954,6 @@ msgstr "Kolab stillingarráðgjafi"
 msgid "Master kolab server"
 msgstr "Aðal kolab miðlari"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Vara kolab miðlari"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -979,11 +983,11 @@ msgstr "Velkomin að Kolab hópvinnumiðlara-ráðgjafanum."
 msgid "Master or slave Kolab server"
 msgstr "Aðal eða vara kolab miðlari"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Þú valdir aðal kolab miðlara"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
@@ -991,11 +995,11 @@ msgstr ""
 "Gefðu upp fullformað vélarnafn á kolab vara-miðlara t.d. þessivél.lén.net "
 "(skildu eftir autt ef enginn vara-miðlari)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Þú velur að stilla Kolab aðal-miðlarann."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Kolab vara-miðlari:"
 
@@ -1009,8 +1013,8 @@ msgid ""
 "FQDN from above. Kolab primary email addresses will be of the type "
 "user@yourdomain"
 msgstr ""
-"Vinsamlega gefðu upp póstlén þitt - Ef þú veist ekki þitt póstlén notaðu fullformaða "
-"netfangið hér að ofan. Aðal-kolab netlén verða af tegundinni "
+"Vinsamlega gefðu upp póstlén þitt - Ef þú veist ekki þitt póstlén notaðu "
+"fullformaða netfangið hér að ofan. Aðal-kolab netlén verða af tegundinni "
 "notandi@þittlén"
 
 #: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
@@ -1062,7 +1066,8 @@ msgid ""
 "create SSL certificates for use within the Kolab environment."
 msgstr ""
 "Kolab getur búið til og haldið utan um skírteinismiðlara, sem síðan er hægt "
-"að nota til að búa til SSL skirteini sem hægt er að nota innan Kolab umhverfisins."
+"að nota til að búa til SSL skirteini sem hægt er að nota innan Kolab "
+"umhverfisins."
 
 #: ../kolab_wizard/Kolab.pm:150
 msgid ""
@@ -1073,8 +1078,15 @@ msgstr ""
 "Kolab miðarann. CA og skírteini"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Sláðu inn lykilsetningu fyrir CA, og lykilsetningu fyrir RSA lykilinn."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab getur búið til og haldið utan um skírteinismiðlara, sem síðan er hægt "
+"að nota til að búa til SSL skirteini sem hægt er að nota innan Kolab "
+"umhverfisins."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1106,21 +1118,22 @@ msgid "With CA"
 msgstr "Með CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab miðlarinn er nú uppsettur og keyrandi. Skráið ykkur inn sem 'manager' "
 "með lykilorðinu sem þú gafst upp á https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Stilli Kolab miðlara á þínu kerfi..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab miðlari"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap ráðgjafi"
@@ -1224,7 +1237,8 @@ msgstr "Lykilorðin eru ekki eins"
 
 #: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
-msgstr "Kerfisstjóri er stjórnunaraðili sem hefur leyfi til að breyta aðgangi að LDAP"
+msgstr ""
+"Kerfisstjóri er stjórnunaraðili sem hefur leyfi til að breyta aðgangi að LDAP"
 
 #: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
 #, perl-format
@@ -1427,7 +1441,8 @@ msgid "Polling interval:"
 msgstr "Athugunar-tími:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Ráðgjafinn hefur stillt Internet fréttaþjónustu miðlarans þíns."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1464,7 +1479,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Mappa:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Slóðin sem þú gafst upp er ekki til."
 
@@ -1527,7 +1542,8 @@ msgstr "NIS miðlari með autofs vörpun"
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Setja upp NIS miðlara með autofs vörpun. auto.home og auto.master skrár."
+msgstr ""
+"Setja upp NIS miðlara með autofs vörpun. auto.home og auto.master skrár."
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid ""
@@ -1557,7 +1573,8 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
-msgstr "NIS lén: NIS lén sem á að nota(venjulega það sama og DNS lénsnafnið þitt)."
+msgstr ""
+"NIS lén: NIS lén sem á að nota(venjulega það sama og DNS lénsnafnið þitt)."
 
 #: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS server: name of your computer."
@@ -1675,7 +1692,8 @@ msgstr "Hvað vilt þú gera:"
 
 #: ../postfix_wizard/Postfix.pm:134
 msgid "Now I need to know your understanding in Postfix server configuration"
-msgstr "Nú þarf ég að fá að vita um skilning þinn á Postfix miðlara uppsetningum"
+msgstr ""
+"Nú þarf ég að fá að vita um skilning þinn á Postfix miðlara uppsetningum"
 
 #: ../postfix_wizard/Postfix.pm:136 ../samba_wizard/Sambashare.pm:167
 msgid "What kind of user are you:"
@@ -1734,7 +1752,8 @@ msgid "Main Postfix server"
 msgstr "Aðal Postfix miðlari"
 
 #: ../postfix_wizard/Postfix.pm:172
-msgid "Verify command: this stops some techniques used to harvest email addresses."
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
 msgstr ""
 "Staðfesti skipun: þetta stöðvar sumar forskriftir sem eru notaðar til að "
 "safna netföngum."
@@ -1775,7 +1794,9 @@ msgstr ""
 msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
-msgstr "Lepplén ætti að vera gilt lénsnafn eins og t.d. \"lén_sem_á_að_leppa.is\" \"með_mitt.is\"!"
+msgstr ""
+"Lepplén ætti að vera gilt lénsnafn eins og t.d. \"lén_sem_á_að_leppa.is\" "
+"\"með_mitt.is\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1840,7 +1861,8 @@ msgstr "mínir áfangastaðir:"
 
 #: ../postfix_wizard/Postfix.pm:217
 msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
-msgstr "Listi af SMTP biðlurum sem er treyst. þ.e: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+"Listi af SMTP biðlurum sem er treyst. þ.e: 127.0.0.0/32, 192.168.1.0/24"
 
 #: ../postfix_wizard/Postfix.pm:217 ../postfix_wizard/Postfix.pm:262
 msgid "my networks:"
@@ -1986,7 +2008,8 @@ msgid "Proxy port:"
 msgstr "Vefsel-port:"
 
 #: ../proxy_wizard/Squid.pm:88
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Ýttu á \"Næsta\" ef þú vilt halda þessu gildi, eða \"Fyrra\" ef þú vilt "
 "leiðrétta."
@@ -2004,7 +2027,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Þú verður að velja port-númer sem er hærra en 1024 og lægra en 65535"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "Disk-minni er það diskpláss sem má nota til að geyma gögn á diski."
 
 #: ../proxy_wizard/Squid.pm:99
@@ -2107,13 +2131,14 @@ msgid "Configuring the Proxy"
 msgstr "Stilli vefselið"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "Ráðgjafinn safnaði eftirfarandi upplýsingum sem hann notar til að stilla "
 "vefselið:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2260,8 +2285,10 @@ msgstr ""
 "notandinn valið hvaða ímynd hann vill ræsa með um PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
-msgstr "Vinsamlega veldu PXE ræsi-ímynd sem þú vilt fjarlægja úr PXE miðlaranum."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+"Vinsamlega veldu PXE ræsi-ímynd sem þú vilt fjarlægja úr PXE miðlaranum."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Remove a boot image"
@@ -2289,8 +2316,10 @@ msgstr ""
 "stöðluðum valkostum."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Vinsamlega veldu úr listanum hér að neðan hvaða PXE ræsi-ímynd þú vilt breyta"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Vinsamlega veldu úr listanum hér að neðan hvaða PXE ræsi-ímynd þú vilt breyta"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2301,8 +2330,10 @@ msgid "Add option to the PXE boot image"
 msgstr "Bæta við valkosti við PXE ræsi-ímyndina"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
-msgstr "Uppsetningarmappa: full slóð að Mandriva Linux uppsetningar-miðlara-möppu"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
+msgstr ""
+"Uppsetningarmappa: full slóð að Mandriva Linux uppsetningar-miðlara-möppu"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
@@ -2330,7 +2361,8 @@ msgstr "Uppsetningaraðferð:"
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "ACPI option: Advanced Configuration and Power Interface"
-msgstr "ACPI valkostur: aflstýring (Advanced Configuration and Power Interface)"
+msgstr ""
+"ACPI valkostur: aflstýring (Advanced Configuration and Power Interface)"
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid ""
@@ -2424,7 +2456,8 @@ msgstr ""
 "stafabila."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Til að bæta við/fjarlægja/breyta PXE ræsi-ímynd, þá verður þú að keyra 'Set "
 "PXE server' fyrst."
@@ -2439,7 +2472,8 @@ msgstr "Vinsamlega skilgreindu annað."
 
 #: ../pxe_wizard/Pxe.pm:237
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "Ráðgjafinn mun nú frumstilla allar grunnskrár til að setja upp PXE miðlarann"
+msgstr ""
+"Ráðgjafinn mun nú frumstilla allar grunnskrár til að setja upp PXE miðlarann"
 
 #: ../pxe_wizard/Pxe.pm:239
 msgid "TFTP directory:"
@@ -2537,11 +2571,14 @@ msgstr "PDC miðlari: aðal lénstjóri"
 msgid ""
 "Server configured as a PDC is responsible for Windows authentication "
 "throughout the domain."
-msgstr "Miðlari stilltur sem PDC er ábyrgur fyrir Windows auðkenningu á öllu léninu."
+msgstr ""
+"Miðlari stilltur sem PDC er ábyrgur fyrir Windows auðkenningu á öllu léninu."
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Stakar miðlarauppsetningar geta notað smbpasswd eða tdbsam lykilorðaforrit"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Stakar miðlarauppsetningar geta notað smbpasswd eða tdbsam lykilorðaforrit"
 
 #: ../samba_wizard/Samba.pm:141
 msgid "Domain logons:"
@@ -2731,7 +2768,8 @@ msgstr "Staðfesta LDAP Lykilorð:"
 msgid ""
 "It specifies where machines should be added to the ldap tree. ie: "
 "ou=Computers"
-msgstr "Það skilgreinir hvar á að bæta vélum inn í ldap gagnatréð.þ.e: ou=Computers"
+msgstr ""
+"Það skilgreinir hvar á að bæta vélum inn í ldap gagnatréð.þ.e: ou=Computers"
 
 #: ../samba_wizard/Samba.pm:260
 msgid "LDAP machine suffix:"
@@ -2801,7 +2839,8 @@ msgstr "Auðkenni Miðlara."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Auðkennið lýsir hvernig þessum miðlara verður lýst á Windows vinnustöðvum."
+msgstr ""
+"Auðkennið lýsir hvernig þessum miðlara verður lýst á Windows vinnustöðvum."
 
 #: ../samba_wizard/Samba.pm:307
 msgid "Banner:"
@@ -2815,7 +2854,8 @@ msgstr "Auðkenni er ekki rétt."
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr "Annáll: notið skrá.%m til að fá sérstakan annál fyrir hverja vél sem tengist"
+msgstr ""
+"Annáll: notið skrá.%m til að fá sérstakan annál fyrir hverja vél sem tengist"
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
@@ -3076,10 +3116,11 @@ msgid "Directory mask:"
 msgstr "Möppu-öryggis-maski:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
 msgstr ""
-"Aðgangs-maski, 'create mode' og 'directory mask' ættu að vera tala. "
-"þ.e. 0755."
+"Aðgangs-maski, 'create mode' og 'directory mask' ættu að vera tala. þ.e. "
+"0755."
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3124,7 +3165,8 @@ msgstr "Ítarlegri valkostir, þrep 1"
 
 #: ../samba_wizard/Sambashare.pm:258
 msgid "Advanced options, use them if you know what you are doing."
-msgstr "Ítarlegri valkostir, notið þá aðeins ef þið vitið hvað þið eruð að gera."
+msgstr ""
+"Ítarlegri valkostir, notið þá aðeins ef þið vitið hvað þið eruð að gera."
 
 #: ../samba_wizard/Sambashare.pm:258
 msgid ""
@@ -3149,7 +3191,8 @@ msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:271
 msgid "Specifies a user that have read-write access to a share. ie: fred"
-msgstr "Tilgreinir notendur sem hafa les-skriftar aðgang að svæði. t.d.: jonjon"
+msgstr ""
+"Tilgreinir notendur sem hafa les-skriftar aðgang að svæði. t.d.: jonjon"
 
 #: ../samba_wizard/Sambashare.pm:271 ../samba_wizard/Sambashare.pm:392
 #: ../samba_wizard/Sambashare.pm:476 ../samba_wizard/Sambashare.pm:590
@@ -3214,7 +3257,8 @@ msgstr "Fela punktaskrár:"
 msgid ""
 "The hide dot files option hides any files on the server that begin with a "
 "dot (.)"
-msgstr "Fela punktskrár felur allar skrár á miðlaranum hvers nafn hefst á punkti (.)"
+msgstr ""
+"Fela punktskrár felur allar skrár á miðlaranum hvers nafn hefst á punkti (.)"
 
 #: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:415
 #: ../samba_wizard/Sambashare.pm:485
@@ -3375,9 +3419,9 @@ msgid ""
 "Be careful, you define your public share writable. This wizard will change "
 "permission to nobody.users, so do not use this feature on a home directory !"
 msgstr ""
-"Aðvörun - Þú skilgreinir þitt almenna svæði skrifanlegt. Þessi ráðgjafi "
-"mun breyta leyfa aðgang frá \"nobody.users\", svo notið ekki þessa "
-"uppsetningu á heimasvæði !"
+"Aðvörun - Þú skilgreinir þitt almenna svæði skrifanlegt. Þessi ráðgjafi mun "
+"breyta leyfa aðgang frá \"nobody.users\", svo notið ekki þessa uppsetningu á "
+"heimasvæði !"
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
@@ -3385,7 +3429,8 @@ msgstr "AÐVÖRUN"
 
 #: ../samba_wizard/Sambashare.pm:465
 msgid "If you don't want to use one of this options, leave it blank."
-msgstr "Ef þú vilt ekki nota eitthvað að þessum valkostum, skildu þá eftir auða."
+msgstr ""
+"Ef þú vilt ekki nota eitthvað að þessum valkostum, skildu þá eftir auða."
 
 #: ../samba_wizard/Sambashare.pm:475
 msgid ""
@@ -3770,19 +3815,19 @@ msgstr "Set upp OpenSSH miðlarann þinn..."
 msgid "OpenSSH server"
 msgstr "OpenSSH miðlari"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tíma ráðgjafi"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Reyndu aftur"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Vista uppsetningu án þess að prófa"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3790,15 +3835,16 @@ msgstr ""
 "Þessi ráðgjafi hjálpar þér við að halda tímanum á miðlaranum þínum í samræmi "
 "við ytri tíma-miðlara."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Þá getur miðlarinn þinn einnig verið tímamiðlari fyrir þitt staðarnet."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "ýttu á \"Næsta\" til að byrja, eða \"Hætta við\" til að stöðva ráðgjafann"
+msgstr ""
+"ýttu á \"Næsta\" til að byrja, eða \"Hætta við\" til að stöðva ráðgjafann"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3806,35 +3852,35 @@ msgstr ""
 "(við mælum með að nota miðlarann pool.ntp.org tvisvar því þessi miðlari "
 "bendir eftir hendingu á tiltæka tímamiðlara)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Veldu aðal og auka miðlara úr listanum."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tímamiðlarar"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Aðal tímamiðlari:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Vara tímamiðlari:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Veldu tímabelti"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Veldu landsvæði:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Veldu borg:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3842,35 +3888,35 @@ msgstr ""
 "Ef tíma-miðlarinn er ekki samstundis tiltækur (netvilla eða önnur ástæða), "
 "þá verður um 30 sekúndna töf."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Ýttu á \"Næsta\" til að byrja prófun á tíma-miðlurum."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Prófa aðgengi að tímamiðlurum"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Tímabelti:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Tíma-miðlararnir svara ekki. Ástæður gætu verið:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- tímamiðlarar ekki til"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ekkert ytra net (Internet)"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- aðrar ástæður..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3878,11 +3924,11 @@ msgstr ""
 "- Þú getur reynt að tengjast tímamiðlurum, eða vista uppsetninguna án þess "
 "að stilla tímann."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Uppsetning tíma-miðlara vistuð"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Miðlarinn getur nú virkað sem tímamiðlari fyrir þitt staðarnet."
 
@@ -3897,7 +3943,8 @@ msgstr "%s er ekki til."
 
 #: ../web_wizard/Apache.pm:72
 msgid "This wizard will help you configuring the Web server for your network."
-msgstr "Þessi ráðgjafi mun hjálpa þér við að setja upp vefþjónustu fyrir þitt net."
+msgstr ""
+"Þessi ráðgjafi mun hjálpa þér við að setja upp vefþjónustu fyrir þitt net."
 
 #: ../web_wizard/Apache.pm:72
 msgid "Web server configuration wizard"
@@ -3923,15 +3970,15 @@ msgstr ""
 "Miðlarinn þin getur verið vefmiðlari fyrir þitt staðarnet (intranet) og "
 "einnig vefmiðlari fyrir Internetið."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Virkja vefmiðlara fyrir staðarnet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Virkja vefmiðlara fyrir Internetið"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3941,11 +3988,11 @@ msgstr ""
 "verður sýnileg á vefmiðlaranum þínum sem http://www.mitt.net/~user, þú "
 "verður beðinn um að gefa upp nafn á möpunni síðar."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Einingar:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3953,7 +4000,7 @@ msgstr ""
 "Leyfir notendum að búa til möppu í sínu heimasvæði sem verður sýnileg á "
 "miðlaranum þínum sem http://www.mitt.net/~notandi."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3961,27 +4008,27 @@ msgstr ""
 "Sláðu inn nafn möppu sem notendur ættu að búa til á sínu heimasvæði (án ~/) "
 "þess að gera það svæði aðgengilegt sem http://www.mitt.net/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Þú verður að tilgreina notandamöppu."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "http undirmappa notanda: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Sláðu inn slóð að möppu sem þú vilt að verði rót fyrir miðluð skjöl."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Vefskjala-rót:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Stilla vefmiðlara"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3989,30 +4036,44 @@ msgstr ""
 "Miðlarinn hefur safnað eftirfarandi upplýsingum sem er þörf fyrir að setja "
 "upp vefmiðlarann þinn"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Staðarnets vefmiðlari:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet vefmiðlari:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Notenda-mappa:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Ráðgjafinn hefur sett upp staðarnets/Internets vef-miðlarann þinn"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache miðlari"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Set upp kerfið þitt sem Apache miðlara ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Skipunin er enn keyrandi. Viltu stöðva hana og hætta í ráðgjafanum?"
+
+#~ msgid "Close"
+#~ msgstr "Loka"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Vara kolab miðlari"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr ""
+#~ "Sláðu inn lykilsetningu fyrir CA, og lykilsetningu fyrir RSA lykilinn."
+
 #~ msgid "Mail domain:"
 #~ msgstr "Póstlén:"
 
@@ -4290,4 +4351,3 @@ msgstr "Set upp kerfið þitt sem Apache miðlara ..."
 #, fuzzy
 #~ msgid "NIS+autofs configuration wizard"
 #~ msgstr "Stillingarálfur"
-
diff --git a/po/it.po b/po/it.po
index 4cd74311..40fabf9c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-03-03 22:48+0100\n"
 "Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -22,8 +22,8 @@ msgstr "assistente di configurazione"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Attenzione."
 
@@ -35,17 +35,17 @@ msgstr "Errore."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
@@ -125,44 +125,44 @@ msgid "Warning"
 msgstr "Attenzione"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Stai utilizzando il DHCP, il server potrebbe non funzionare con questa "
 "configurazione."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Errore"
 
@@ -226,16 +226,6 @@ msgstr ""
 "nullo. Il suo nome di dominio deve essere un FQDN (nome di dominio "
 "completamente qualificato). Esegui drakconnect per correggerlo."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Il comando è ancora in esecuzione. Vuoi eliminarlo e uscire dall'assistente?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Chiudi"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Configurazione DHCP"
@@ -327,8 +317,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "inattivo"
 
@@ -336,8 +326,8 @@ msgstr "inattivo"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "attivo"
 
@@ -356,13 +346,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Fallito"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Riavvia drakwizard e cerca di modificare alcuni parametri"
 
@@ -682,19 +672,24 @@ msgstr "Server news"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Server Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selezione assistente di Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Scegli un assistente"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -703,7 +698,7 @@ msgstr ""
 "%s non è installato.\n"
 "Premi \"Avanti\" per installarlo o \"Annulla\" per uscire."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installazione non riuscita"
 
@@ -990,11 +985,6 @@ msgstr "Assistente di configurazione di Kolab"
 msgid "Master kolab server"
 msgstr "Server DNS primario"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server DNS secondario"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1028,22 +1018,22 @@ msgstr "Benvenuti nell'assistente di configurazione del server Kolab Groupware"
 msgid "Master or slave Kolab server"
 msgstr "Server DNS primario"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Il server LDAP è già stato configurato"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server DNS secondario"
@@ -1119,7 +1109,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1155,21 +1148,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Ora il server Kolab è stato configurato e attivato. Entra come \"manager\" "
 "su https://127.0.0.1/kolab/admin/, la password è quella che hai impostato."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurazione del server Kolab sul sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Server Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Configurazione Ldap"
@@ -1523,7 +1517,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Il percorso inserito non esiste."
 
@@ -2231,7 +2225,7 @@ msgstr ""
 "proxy."
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -4017,19 +4011,19 @@ msgstr "Configurando il tuo server OpenSSH..."
 msgid "OpenSSH server"
 msgstr "Server OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Configurazione orario"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Prova ancora"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Salva la configurazione senza test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -4037,16 +4031,16 @@ msgstr ""
 "Questo assistente ti aiuterà a configurare il server in modo che sincronizzi "
 "il proprio orario con quello di un time server esterno."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "In questo modo il tuo server farà da time server per la rete locale."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Premi \"Avanti\" per iniziare, o \"Annulla\" per chiudere l'assistente."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -4054,35 +4048,35 @@ msgstr ""
 "(È consigliabile usare pool.ntp.org in entrambi i casi: si tratta infatti di "
 "un server che reindirizza casualmente verso diversi time server disponibili.)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Scegli dall'elenco un server primario e uno secondario."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Time server"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Time server primario:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Time server secondario:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Scelta del fuso orario"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Scegli una zona:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Scegli una località:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -4090,35 +4084,35 @@ msgstr ""
 "Se un time server non fosse disponibile immediatamente (per problemi di rete "
 "o altro), ci sarà un'attesa di circa 30 secondi."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Premi \"Avanti\" per avviare il test dei time server."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Verifica della disponibilità dei time server"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Fuso orario:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "I time server non rispondono. Le cause potrebbero essere:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- time server inesistenti"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- rete esterna irraggiungibile"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- altri motivi..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -4126,11 +4120,11 @@ msgstr ""
 "Puoi tentare ancora di contattare i time server, oppure salvare la "
 "configurazione senza regolare l'ora."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configurazione del time server salvata."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Il server è ora in grado di funzionare da time server per la rete locale."
@@ -4172,15 +4166,15 @@ msgstr ""
 "Il tuo server può funzionare da server web sia per la rete locale che per "
 "Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Attiva il server web per Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Attiva il server web per Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4191,11 +4185,11 @@ msgstr ""
 "www.tuoserver.com/~nomeutente. Il nome della directory andrà specificato più "
 "avanti."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduli:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4204,7 +4198,7 @@ msgstr ""
 "Consente agli utenti di avere una directory nelle loro home directories \n"
 "accessibile via web da \"http://www.tuoserver.com/~nomeutente\"."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4213,30 +4207,30 @@ msgstr ""
 "proprie directory home (senza ~/) affinché sia accessibile da \"http://www."
 "tuoserver.com/~nomeutente\"."
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Devi specificare il nome del dominio internet locale"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Sottodirectory http per gli utenti: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Inserisci il percorso della directory che vuoi usare come radice per i "
 "documenti."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Directory radice dei documenti:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configurazione del server web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4244,31 +4238,44 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "server web."
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Server web per Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Server web per Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Directory utente:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server web"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Server web Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurazione del server Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Il comando è ancora in esecuzione. Vuoi eliminarlo e uscire "
+#~ "dall'assistente?"
+
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server DNS secondario"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Dominio posta elettronica:"
 
diff --git a/po/ja.po b/po/ja.po
index e597a517..c2dff97b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-05 23:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -23,8 +23,8 @@ msgstr "設定ウィザード"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "警告"
 
@@ -36,17 +36,17 @@ msgstr "エラー"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "おめでとうございます"
 
@@ -122,43 +122,43 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "エラー"
 
@@ -217,15 +217,6 @@ msgstr ""
 "ローカルドメインや「なし」は使えません。また、ホストネームはFQDN(完全修飾ドメ"
 "イン名)でなければいけません。drakconnectを起動して修正してください。"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "コマンドを実行中です。中止してウィザードを終了しますか？"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "閉じる"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCPウィザード"
@@ -312,8 +303,8 @@ msgstr "DHCPサービスの設定に必要な以下の情報を集めました:"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "無効"
 
@@ -321,8 +312,8 @@ msgstr "無効"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "有効"
 
@@ -340,13 +331,13 @@ msgstr "DHCPサービスの設定が完了しました。"
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "失敗しました。"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizardを再起動して設定を変更してみてください。"
 
@@ -650,19 +641,24 @@ msgstr "ニュースサーバ"
 msgid "NFS server"
 msgstr "NFSサーバ"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolabサーバ"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTPサーバ"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizardのウィザード選択"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "ウィザードを選んでください"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -672,7 +668,7 @@ msgstr ""
 "[次へ]を押すとインストールを開始します。\n"
 "中止する場合は[キャンセル]を押してください。"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "インストールに失敗しました。"
 
@@ -938,10 +934,6 @@ msgstr "Kolabの設定ウィザード"
 msgid "Master kolab server"
 msgstr "マスターKolabサーバ"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "スレーブKolabサーバ"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -971,11 +963,11 @@ msgstr "Kolabグループウェアサーバの設定ウィザードへようこ�
 msgid "Master or slave Kolab server"
 msgstr "マスター/スレーブKolabサーバ"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "マスターKolabサーバを選ばれました。"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
@@ -983,11 +975,11 @@ msgstr ""
 "スレーブKolabサーバのFQDN(完全装飾ドメイン名)を thishost.domain.tld のように"
 "入力してください。ない場合は空白にしておいてください。"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "マスターKolabサーバを設定することを選ばれました。"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "スレーブKolabサーバ:"
 
@@ -1065,8 +1057,14 @@ msgstr ""
 "す。"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "CAとRSAキーのパスフレーズを入力してください。"
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"KolabはCA(認証局)を作成・管理することができます。このCAはKolab環境で使用する"
+"ためのSSL証明書の発行に利用できます。"
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1098,22 +1096,23 @@ msgid "With CA"
 msgstr "CA付き"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolabサーバの設定が完了しました。次のアドレスに'manager'でログインしてくださ"
 "い。\n"
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "システムのKolabサーバを設定..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolabサーバ"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAPウィザード"
@@ -1452,7 +1451,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "ディレクトリ:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "入力されたパスはありません。"
 
@@ -2096,7 +2095,7 @@ msgid ""
 msgstr "プロキシの設定に必要な以下の情報を集めました:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3744,35 +3743,35 @@ msgstr "OpenSSHサーバを設定.."
 msgid "OpenSSH server"
 msgstr "OpenSSHサーバ"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "タイムウィザード"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "やり直す"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "このまま保存"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr "このウィザードでは外部タイムサーバとこのサーバの時刻を同期させます。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "そうすることによって、このサーバはネットワークのローカルタイムサーバになりま"
 "す。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "[次へ]を押すと開始します。[キャンセル]でウィザードを終了します。"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3780,35 +3779,35 @@ msgstr ""
 "(pool.ntp.orgを２回使うことをおすすめします。このサーバは利用可能なタイムサー"
 "バーをランダムに返します。"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "プライマリ/セカンダリサーバをリストから選んでください。"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "タイムサーバ"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "プライマリタイムサーバ:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "セカンダリタイムサーバ:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "タイムゾーンを選んでください"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "地域を選んでください:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "都市を選んでください:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3816,45 +3815,45 @@ msgstr ""
 "タイムサーバがネットワークその他の理由ですぐに応答しない場合は、約30秒の間隔"
 "をおきます。"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "[次へ]を押すとタイムサーバのテストを開始します。"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "タイムサーバをテスト"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "タイムゾーン:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "タイムサーバが応答しません。以下の理由が考えられます:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- タイムサーバがない"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- 外部ネットワークがない"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- その他.."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr "- もう１度やり直すか、時刻を設定せずに設定を保存してください。"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "タイムサーバの設定を保存しました。"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "これでサーバがローカルネットワークのタイムサーバとして働きます。"
 
@@ -3895,15 +3894,15 @@ msgstr ""
 "このサーバはイントラネット(内部ネットワーク)とインターネットのウェブサーバと"
 "して使えます。"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "イントラネット用のウェブサーバを有効にする"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "インターネット用のウェブサーバを有効にする"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3913,11 +3912,11 @@ msgstr ""
 "のホームディレクトリでユーザにディレクトリの所有を許可します。このディレクト"
 "リの名前は後で設定します。"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "モジュール: "
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3925,7 +3924,7 @@ msgstr ""
 "http://www.yourserver.com/~user経由で利用できるHTTPサーバのホームディレクトリ"
 "でユーザにディレクトリの所有を許可します。"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3933,52 +3932,65 @@ msgstr ""
 "ユーザがホームに作成するディレクトリの名前を ~/ を付けずに入力してください。"
 "http://www.yourserver.com/~user経由で利用できるようになります。"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "ユーザディレクトリを指定してください。"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "ユーザのHTTPサブディレクトリ: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Document Rootにするディレクトリのパスを入力してください。"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "ウェブサーバを設定"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "ウェブサーバの設定に必要な以下の情報を集めました:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "イントラネットウェブサーバ:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "インターネットウェブサーバ:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "ユーザのディレクトリ:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "イントラネット/インターネットウェブサーバの設定が完了しました。"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apacheサーバ"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "システムをApacheサーバとして設定.."
+
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "コマンドを実行中です。中止してウィザードを終了しますか？"
+
+#~ msgid "Close"
+#~ msgstr "閉じる"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "スレーブKolabサーバ"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr "CAとRSAキーのパスフレーズを入力してください。"
diff --git a/po/ko.po b/po/ko.po
index b7cca765..e8a573ee 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -26,8 +26,8 @@ msgstr "설정 마법사"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "경고."
 
@@ -39,17 +39,17 @@ msgstr "오류."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "축하합니다."
 
@@ -127,7 +127,7 @@ msgid "Warning"
 msgstr "경고"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -135,37 +135,37 @@ msgstr ""
 "다."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "오류"
 
@@ -221,15 +221,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "닫기"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP 마법사"
@@ -315,8 +306,8 @@ msgstr "마법사가 DHCP 서버 설정을 위해 계산한 값은 다음과 같
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "금지"
 
@@ -324,8 +315,8 @@ msgstr "금지"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "허용"
 
@@ -344,13 +335,13 @@ msgstr "마법사가 성공적으로 DHCP 서버를 설정하였습니다."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "실패"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -675,19 +666,25 @@ msgstr "뉴스 서버"
 msgid "NFS server"
 msgstr "NFS 서버"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "데이터베이스 서버"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP 서버"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "드레이크위저드 마법사 선택"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "마법사를 선택하세요."
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -696,7 +693,7 @@ msgstr ""
 "[%s]가 설치되어 있지 않습니다.\n"
 "지금 설치하려면, [다음]을, 그냥 종료하려면, [취소]를 누르세요."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "설치 실패."
 
@@ -966,11 +963,6 @@ msgstr "삼바 설정 마법사"
 msgid "Master kolab server"
 msgstr "NFS 서버"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS 서버"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -996,22 +988,22 @@ msgstr "웹 서버 설정 마법사"
 msgid "Master or slave Kolab server"
 msgstr "NFS 서버"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS 서버"
@@ -1087,7 +1079,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1122,21 +1117,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP 서버 설정 중"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "데이터베이스 서버"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "삼바 마법사"
@@ -1496,7 +1490,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "디렉토리:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2126,7 +2120,7 @@ msgid ""
 msgstr "마법사가 프락시 서버 설정을 위해 계산한 값은 다음과 같습니다:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3727,19 +3721,19 @@ msgstr "FTP 서버 설정 중"
 msgid "OpenSSH server"
 msgstr "인트라넷 웹 서버:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "시간 마법사"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "재시도"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "테스트 없이 설정 저장"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 #, fuzzy
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
@@ -3748,53 +3742,53 @@ msgstr ""
 "이 마법사는 지역적 방법 또는 외부 시간 서버와의 연동을 통한 서버 시간 설정을 "
 "도울 것입니다."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "이제 이 서버가 지역 네트웍의 시간 서버입니다."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "시작하려면 [다음]을, 마법사를 종료하려면 [취소]를 누르세요."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 #, fuzzy
 msgid "Select a primary and secondary server from the list."
 msgstr "목록에서 주 그리고 보조 서버를 선택하거나, 직접 지정해 주세요:"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "시간 서버"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "주 시간 서버:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "보조 시간 서버:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "시간대 선택:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "시간대 선택:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "시간대 선택:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3802,35 +3796,35 @@ msgstr ""
 "만약 시간 서버가 (네트웍 또는 기타 원인으로) 즉시 사용할 수 없으면, 30분 정"
 "도 기다려 주세요."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "시간 서버를 테스트하려면 [다음]을 누르세요."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "시간 서버 유효성 테스트 중"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "시간대:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "시간 서버가 응답하지 않습니다. 다음과 같은 원인이 있을 수 있습니다:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- 존재하지 않는 시간 서버들"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- 외부 네트웍 없음"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- 다른 원인..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3839,11 +3833,11 @@ msgstr ""
 "시간 서버에 재접속을 시도하거나, 실재로 시간 설정을 하지않고 설정을 저장할 "
 "수 있습니다."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "시간 서버 설정 저장 완료"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "이제 이 서버가 지역 네트웍의 시간 서버로서 작동합니다."
 
@@ -3884,93 +3878,100 @@ msgid ""
 msgstr ""
 "이 서버는 내부 네트웍(인트라넷)과 인터넷을 위한 웹 서버로 작동할 수 있습니다."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "인트라넷에 대해 웹서버 허용"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Enable the Web server for the Internet"
 msgstr "인트라넷에 대해 웹서버 허용"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "데이터베이스 서버"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "웹 서버 설정 중"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "마법사가 웹 서버 설정을 위해 계산한 값은 다음과 같습니다."
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "인트라넷 웹 서버:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 #, fuzzy
 msgid "Internet web server:"
 msgstr "인터넷 웹 서버:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "사용자 디렉토리:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "마법사가 성공적으로 인트라넷/인터넷 웹 서버를 설정하였습니다."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "인트라넷 웹 서버:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS 서버 설정 중"
 
+#~ msgid "Close"
+#~ msgstr "닫기"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS 서버"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "디렉토리:"
diff --git a/po/ku.po b/po/ku.po
index f50f3e1d..4270aa37 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ku\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-05-22 20:15+0100\n"
 "Last-Translator: Kader DILSIZ, Amed çiya <kader@kaderland.net, "
 "amedcj@hotmail.com>\n"
@@ -21,8 +21,8 @@ msgstr "sêrbaza avakirinê"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Hişyar 'be."
 
@@ -34,17 +34,17 @@ msgstr "Xeletî."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Pîroz be"
 
@@ -122,43 +122,43 @@ msgid "Warning"
 msgstr "Hişyar 'be"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Hûn DHCP'ê bi kar tînin, dibe ku pêşkêşkara we bi vê avakirinê nexebite."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Xeletî"
 
@@ -223,15 +223,6 @@ msgstr ""
 "hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî none be. Ji "
 "bo mîhengkirinê drakconnectê bixebitînin."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Bigire"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Sêrbaza DHCP'ê"
@@ -320,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "Pasîf"
 
@@ -329,8 +320,8 @@ msgstr "Pasîf"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "çalak bû"
 
@@ -350,13 +341,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Bi ser neket"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Drakwizardê dadin û vekin û guherandina hinek parametreyan biceribînin."
@@ -683,19 +674,24 @@ msgstr "Pêşkêşkara nûçeyan"
 msgid "NFS server"
 msgstr "Pêşkêşkara NFS'ê"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Pêşkêşkara Kolabê"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Pêşkêşkara FTP'ê"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Hilbijartina sêrbaza Drakwizardê"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Ji kerema xwe re sêrbazekê hilbijêrin"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -705,7 +701,7 @@ msgstr ""
 "hûn dikarin pêl \"Pêş\"ê bikin û sazkirinê bidin destpêkirinan jî\n"
 "pêl \"Betal\"ê bikin û dev ji barkirinê berdin"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Saz kirin bi ser neket."
 
@@ -1001,11 +997,6 @@ msgstr "Sêrbaza avakirinê ya Kolabê"
 msgid "Master kolab server"
 msgstr "Pêşkêşkara DNS'ê ya bingehîn"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Pêşkêşkara DNS'ê ya duyemîn"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1030,22 +1021,22 @@ msgstr "Sêrbaza Avakirinê ya Pêşkêşkara Webê"
 msgid "Master or slave Kolab server"
 msgstr "Pêşkêşkara DNS'ê ya bingehîn"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Sêrbazê pêşkêşkara Samba bi awayekî biserkekî ava kir."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Pêşkêşkara DNS'ê ya duyemîn"
@@ -1121,7 +1112,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1155,19 +1149,19 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Pêşkêşkara PXE'yê di pergala we de tê vakirin..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Pêşkêşkara Kolabê"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Sêrbaza Ldapyê"
@@ -1533,7 +1527,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Rêzik:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Riaya ku hû ketinê nîn e."
 
@@ -2184,7 +2178,7 @@ msgstr ""
 "daxuyand:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3846,19 +3840,19 @@ msgstr "Pêşkêşkara Samba tê avakirin..."
 msgid "OpenSSH server"
 msgstr "Pêşkêşkara Apache Webê"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Sêrbaza demê"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Ji nû ve biceribîne"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Avakirinê bêyî ceribandinê qeyd bike"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3866,53 +3860,53 @@ msgstr ""
 "Ev sêrbaz, dema hûn saeta pêşkêşkara  xwe wekî saeta pêşkêşkareke din mîheng "
 "bikin dê ji we re bibe alîkar."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 #, fuzzy
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Pêşkêşkara we ji bo tora we ya hundirîn niha dikare bibe pêşkêşkara demê."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "An ji bo destpêkirinê pêl Pêşê, an jî ji bo derketina ji sêrbazê pêl Betalê "
 "bikin"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Ji lîsteyê pêşkêşkareke yekemîn û yeke duyemîn hilbijêrin."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Pêşkêşkara demê"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Pêşkêşkara demê ya yekemîn:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Pêşkêşkara demê ya duyemîn:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Bir zaman dilimi seçin"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Herêmekê hilbijêrin:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Bajarekî hilbijêrin:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3920,35 +3914,35 @@ msgstr ""
 "Heke pêşkêşkara demê aniha peyda nebe (ji ber pirsgrêkên torê an jî "
 "pirsgrêkên din) hûnê hûnê 30 çirk bisekinin."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Ji bo ceribandina pêşkêşkarên demê pêl Pêşê bikin."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Rewacdariya pêşkêşkarên demê tên ceribandin"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zaman dilimi:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Pêşkêşkarên demê bersîv nadin. Sedemên biguman:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- pêşkêşkarên deme yên nîn in"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- tora derve nîn e"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- sedemên din..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3956,11 +3950,11 @@ msgstr ""
 "Hûn dikarin xwegirêdana bi pêşkêşkarên demê biceribînin an jî niha bêyî "
 "mîhengkirina saetê avakirinê qeyd bikin."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Avakirina pêşkêşkara demê hate qeydkirin"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Pêşkêşkara we ji bo tora we ya hundirîn niha dikare bibe pêşkêşkara demê."
@@ -4004,15 +3998,15 @@ msgstr ""
 "Dibe ku pêşkêşkara we hem di tora we ya hundirîn (Intranet) de hem jî di "
 "Internetê de wekî pêşkêşkara Webê tev bigere."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Pêşkêşkara Webê ji bo Intranetê çalak bike"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Pêşkêşkara Webê ji bo Internetê çalak bike"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4022,11 +4016,11 @@ msgstr ""
 "http sunuvusu için erişilebilir kılar.[http://www.sunucunuz.com/~user] Size "
 "sizin ismi sonradan sorulacaktır."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modul:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4036,7 +4030,7 @@ msgstr ""
 "http sunuvusu için erişilebilir kılar.[http://www.sunucunuz.com/~user] Size "
 "sizin ismi sonradan sorulacaktır."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4045,28 +4039,28 @@ msgstr ""
 "kullanıcıların kendi ev dizinleri altında oluşturmaları gereken dizinin "
 "adını girin (~/ kısmı hariç)"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Pêşkêşkara PXE'yê saz bike."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "rêzika-bin a httpa bikarhêner: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Riya rêzika ku hûn dixwazin bikin koka dokumentê bikevinê:"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Kokê dokumentê:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Pêşkêşkara Webê tê avakirin"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4074,32 +4068,39 @@ msgstr ""
 "Sêrbazê, parametreyên ku ji bo avakirina Pêşkêşkara we ya Webê divên bi vî "
 "awayê diyar kirin:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Pêşkêşkara intranet webê:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Pêşkêşkara internet webê:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Rêzika bikarhêneran:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Sêrbazê Pêşkêşkara we ya Webê ya Intranet/Internetê bi awayekî biserketî ava "
 "kir."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Pêşkêşkara Apache Webê"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Pergala we wekî Pêşkêşkara Apache Webê tê avakirin..."
 
+#~ msgid "Close"
+#~ msgstr "Bigire"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Pêşkêşkara DNS'ê ya duyemîn"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Qada NIS'ê:"
 
diff --git a/po/ky.po b/po/ky.po
index 766f04b3..62ef8310 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-04-06 15:24+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kirghiz\n"
@@ -22,8 +22,8 @@ msgstr "ырастоо устасы"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Эскертүү."
 
@@ -35,17 +35,17 @@ msgstr "Ката."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Куттуктайбыз"
 
@@ -122,44 +122,44 @@ msgid "Warning"
 msgstr "Эскертүү"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Ката"
 
@@ -224,16 +224,6 @@ msgstr ""
 "домендик ат менен аныкталышы керек (FQDN, Fully Qualified Domain Name). Аны "
 "өзгөртүү үчүн drakconnect'ти ишке ашырыңыз."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Буйрук иштеп жатат. Сиз аны өлтүрүү же устанын аяктоосун калап жатасыз?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Жабуу"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Устасы"
@@ -321,8 +311,8 @@ msgstr "Уста сиздин DHCP кызматын ырастоо үчүн ке
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "өчүк"
 
@@ -330,8 +320,8 @@ msgstr "өчүк"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "жанык"
 
@@ -349,13 +339,13 @@ msgstr "Уста DHCP кызматын ийгиликтүү орнотту."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Игиликсиз аяктады"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizard'ты кайра иштетиңиз , жана кээ бир параметрлерди өзгөртүңүз."
 
@@ -660,19 +650,24 @@ msgstr "Жаңылыктар сервери"
 msgid "NFS server"
 msgstr "NFS сервери"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab сервери"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP сервери"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard уста тандоосу"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Устаны тандаңыз"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -681,7 +676,7 @@ msgstr ""
 "%s жүктөлгөн жок\n"
 "Жүктөө үчүн \"Кийинки\"'ни же чыгуу үчүн \"Айнуу\"'ну басыңыз"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Жүктөө ийгиликсиз аяктады"
 
@@ -969,11 +964,6 @@ msgstr "Kolab ырастоо устасы"
 msgid "Master kolab server"
 msgstr "Негизги DNS сервер"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Жардамчы DNS сервер"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -998,22 +988,22 @@ msgstr "Kolab Groupware серверин ырастоо устасына кош
 msgid "Master or slave Kolab server"
 msgstr "Негизги DNS сервер"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Сиз өзүңүздүн LDAP сервериңизди ырастадыңыз"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Жардамчы DNS сервер"
@@ -1089,7 +1079,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1123,21 +1116,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "kolab сервери ырасталды жана иштетилүүдө. https://127.0.0.1/kolab/admin/ "
 "адреси менен мурун 'manager' үчүн кирген сырсөз менен системага кириңиз"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери сиздин системаңызда ырасталууда..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab сервери"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP Устасы"
@@ -1470,7 +1464,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Папке:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2065,7 +2059,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3649,111 +3643,111 @@ msgstr "Сиздин система жардамчы DNS сервер катар
 msgid "OpenSSH server"
 msgstr "NFS сервери"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3792,88 +3786,100 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Сиз биринчиден LDAP серверин орнотушуңуз керек."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Буйрук иштеп жатат. Сиз аны өлтүрүү же устанын аяктоосун калап жатасыз?"
+
+#~ msgid "Close"
+#~ msgstr "Жабуу"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Жардамчы DNS сервер"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Почта домени:"
 
diff --git a/po/lt.po b/po/lt.po
index e34f7e89..18d64594 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DRAKWIZARD VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-04-05 14:53+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: LITHUANIAN\n"
@@ -23,8 +23,8 @@ msgstr "konfigūracijos vedlys"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Įspėjimas."
 
@@ -36,17 +36,17 @@ msgstr "Klaida."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Sveikiname"
 
@@ -127,43 +127,43 @@ msgid "Warning"
 msgstr "Įspėjimas"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Jūs naudojate dhcp protokolą, serveris su jūsų konfigūracija gali nedirbti."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Klaida"
 
@@ -227,15 +227,6 @@ msgstr ""
 "Kompiuterio vardas turi būti FQDN: Fully Qualified Domain Name (pilnai "
 "kvalifikuotas domeno vardas). Paleiskite drakconnect jo pakeitimui."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Komanda tebevykdoma. Ar norite nutraukti vykdymą ir uždaryti vedlį?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Uždaryti"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP vedlys"
@@ -324,8 +315,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "išjungta"
 
@@ -333,8 +324,8 @@ msgstr "išjungta"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "įjungta"
 
@@ -352,13 +343,13 @@ msgstr "Vedlys sėkmingai sukonfigūravo DHCP paslaugas."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Nepavyko"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Dar kartą paleiskite drakwizard ir pabandykite pakeisti parametrus."
 
@@ -676,19 +667,24 @@ msgstr "Naujienų serveris"
 msgid "NFS server"
 msgstr "NFS serveris"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab serveris"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP serveris"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard vedlio parinkimas"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Prašau pasirinkti vedlį"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -698,7 +694,7 @@ msgstr ""
 "Spauskite \"Toliau\" , jei norite įdiegti, arba \"Atšaukti\" , jei norite "
 "baigti"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
@@ -986,11 +982,6 @@ msgstr "Kolab konfigūravimo vedlys"
 msgid "Master kolab server"
 msgstr "Pagrindinis DNS serveris"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Pagalbinis DNS serveris"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1023,22 +1014,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Pagrindinis DNS serveris"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Jūs jau sukonfigūravote Ldap serverį"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Pagalbinis DNS serveris"
@@ -1114,7 +1105,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1149,21 +1143,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab serveris sukonfigūruotas ir veikia. Prisijunkite kaip 'manager' su "
 "slaptažodžiu, kurį įvedėte čia: https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Jūsų sistemoje konfigūruojamas Kolab serveris..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab serveris"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap vedlys"
@@ -1513,7 +1508,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalogas:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Jūsų įvesto kelio nėra."
 
@@ -2179,7 +2174,7 @@ msgstr ""
 "konfigūravimui:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3838,19 +3833,19 @@ msgstr "Konfigūruojamas jūsų Samba serveris..."
 msgid "OpenSSH server"
 msgstr "Apache serveris"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Laiko vedlys"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Bandykite dar kartą"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Išsaugoti konfigūraciją be patikrinimo"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3858,15 +3853,15 @@ msgstr ""
 "Vedlys padės nustatyti jūsų serverio laiką, sinchronizuotą su išoriniu laiko "
 "serveriu."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Tokiu būdu, jūsų serveris bus vietiniu laiko serveriu jūsų tinklui."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "jei norite pradėti, spauskite Toliau, jei uždaryti vedlį - Atšaukti"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3874,35 +3869,35 @@ msgstr ""
 "(mes rekomenduojame naudoti šį serverį pool.ntp.org du kartus, nes jis "
 "atsitiktinai kreipiasi į veikiančius laiko serverius)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Iš sąrašo išrinkite pirminį ir antrinį serverius."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Laiko serveriai"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Pirminis laiko serveris:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Antrinis laiko serveris:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Pasirinkite laiko zoną"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Pasirinkite regioną:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Pasirinkite miestą:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3910,35 +3905,35 @@ msgstr ""
 "Jei serveris bus nepasiekiamas (dėl tinklo ar kitų priežasčių), bus "
 "suformuotas apie 30 sek. atidėjimas."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Laiko serverių patikrinimui spauskite Toliau."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Tikrinami laiko serveriai"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Laiko zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Laiko serveriai neatsako. Galimos priežastys:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- neegzistuojantys laiko serveriai"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nėra išorinio tinklo"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- kitos priežastys..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3946,11 +3941,11 @@ msgstr ""
 "- Galite dar kartą bandyti prisijungti prie laiko serverių arba išsaugoti "
 "konfigūraciją be laiko nustatymo."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Laiko serverio konfigūracija išsaugota"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Jūsų serveris dabar gali dirbti kaip vietinio tinklo laiko serveris."
 
@@ -3992,15 +3987,15 @@ msgstr ""
 "Jūsų serveris gali dirbti kaip Web serveris vietiniame tinkle (intranetas) "
 "ir kaip Interneto Web serveris."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Įgalinti Web serverį intranetui"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Įgalinti Web serverį Internetui"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4010,11 +4005,11 @@ msgstr ""
 "sukurti katalogus jūsų http serveryje per  http://www.jususerveris.com/"
 "~vartotojas, vėliau jūs busite paprašytas įvesti šio katalogo vardą."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduliai:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4023,7 +4018,7 @@ msgstr ""
 "Leidžia vartotojams savo pradiniuose kataloguose sukurti katalogus \n"
 "jūsų http serveryje per  http://www.jususerveris.com/~vartotojas"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4031,30 +4026,30 @@ msgstr ""
 "Įrašykite vardą katalogo, kuriame vartotojai galės sukurti savo pradinius "
 "katalogus (be ~/), pasiekiamas per http://www.jususerveris.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Pirmiausia turite įdiegti Ldap serverį."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "vartotojo http pakatalogis: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Nurodykite kelią katalogo, kurį norite paskirti dokumento pagrindiniu "
 "katalogu."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumento pagrindinis katalogas:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigūruojamas Web serveris"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4062,30 +4057,41 @@ msgstr ""
 "Vedlys surinko sekančius parametrus, kurie reikalingi Web serverio "
 "konfigūravimui"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intraneto web serveris:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Interneto web serveris:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Vartotojo katalogas:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Vedlys sėkmingai sukonfigūravo intraneto/Interneto Web serverį"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache serveris"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Jūsų sistema konfigūruojama kaip Apache serveris ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Komanda tebevykdoma. Ar norite nutraukti vykdymą ir uždaryti vedlį?"
+
+#~ msgid "Close"
+#~ msgstr "Uždaryti"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Pagalbinis DNS serveris"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Pašto domenas:"
 
diff --git a/po/lv.po b/po/lv.po
index 723906ac..a2f3c2d6 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -21,8 +21,8 @@ msgstr "Konfigurācijas meistars"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Brīdinājums"
@@ -35,17 +35,17 @@ msgstr "Kļūda."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Apsveicam"
 
@@ -126,44 +126,44 @@ msgid "Warning"
 msgstr "Brīdinājums"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Kļūda"
 
@@ -218,15 +218,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Aizvērt"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP meistars"
@@ -314,8 +305,8 @@ msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu DHCP serveri"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "aizliegts"
 
@@ -323,8 +314,8 @@ msgstr "aizliegts"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "atļauts"
 
@@ -343,13 +334,13 @@ msgstr "Meistars veiksmīgi nokonfigurēja DHCP servisu priekš Jūsu servera."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Neizdevās"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -663,19 +654,25 @@ msgstr "News serveris"
 msgid "NFS server"
 msgstr "NFS serveris"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Datubāzu serveris"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP serveris"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard meistara izvēle"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Lūdzu, izvēlieties meistaru"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -684,7 +681,7 @@ msgstr ""
 "%s nav instalēts\n"
 "Klikšķiniet \"Nākamis\", lai instalētu, vai \"Atlikt\" lai beigtu"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
@@ -952,11 +949,6 @@ msgstr "Samba konfigurēšanas meistars"
 msgid "Master kolab server"
 msgstr "NFS serveris"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS serveris"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -982,22 +974,22 @@ msgstr "Web servera konfigurēšanas meistars"
 msgid "Master or slave Kolab server"
 msgstr "NFS serveris"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS serveris"
@@ -1071,7 +1063,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1107,21 +1102,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Datubāzu serveris"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap meistars"
@@ -1477,7 +1471,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorijs:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2100,7 +2094,7 @@ msgid ""
 msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu Proksī"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3687,19 +3681,19 @@ msgstr "Tiek konfigurēts FTP serveris"
 msgid "OpenSSH server"
 msgstr "Intraneta Web serveris"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Laika meistars"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Mēģiniet vēlreiz"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Saglabāt konfigurāciju bez testa"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 #, fuzzy
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
@@ -3708,55 +3702,55 @@ msgstr ""
 "Šis meistars palīdzēs Jums uzstādīt servera pulksteņa laiku, vai nu lokālu, "
 "vai sinhronizētu ar āreju laika serveri"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Šādi Jūsu serveris būs vietējais laika serveris Jūsu tīklam."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "spiediet Nākamais lai sāktu, vai arī Atlikt lai pārtrauktu šo vedni."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 #, fuzzy
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 "Izvēlieties primāro un sekundāro laika serveri no saraksta, vai arī norādiet "
 "kādu:"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Laika serveri"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primārais laika serveris:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundārais laika serveris:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Izvēlieties laika zonu:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Izvēlieties laika zonu:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Izvēlieties laika zonu:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3764,35 +3758,35 @@ msgstr ""
 "Ja laika serveris nav nekavējoties pieejams (tīkla vai citi iemesli), Jums "
 "būs jāuzgaida apmēram 30 sekundes."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Spiediet Nākamais, lai sāktu laika serveru pārbaudi."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Tiek pārbaudīta laika servera pieejamība"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Laika zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Laika serveri neatsaucas. Iemesli var būt:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- neeksistējoši laika serveri"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nav pieejams ārējais tīkls"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- citi iemesli ..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3801,11 +3795,11 @@ msgstr ""
 "Jūs varat vēlreiz mēģināt sazināties ar laika serveriem, jeb saglabāt "
 "konigurāciju bez laika iestādīšanas."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Laika servera konfigurācija saglabāta"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Jūsu serveris tagad var darboties kā laika serveris Jūsu lokālajam tīklam."
@@ -3848,93 +3842,100 @@ msgstr ""
 "Jūsu serveris var darboties kā Web serveris priekš Jūsu iekšējā tīkla "
 "(Intraneta) un kā Web serveris priekš Interneta"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Atļaut Web serveri Internetam"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Enable the Web server for the Internet"
 msgstr "Atļaut Web serveri Internetam"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Datubāzu serveris"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Tiek konfigurēts Web serveris"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu Web serveri"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Intraneta Web serveris"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 #, fuzzy
 msgid "Internet web server:"
 msgstr "Interneta Web serveris:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Lietotāja direktorija:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Meistars veiksmīgi nokonfigurēja Intraneta/Interneta Web serveri"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Intraneta Web serveris"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Tiek konfigurēts DNS serveris"
 
+#~ msgid "Close"
+#~ msgstr "Aizvērt"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS serveris"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "Direktorijs:"
diff --git a/po/mk.po b/po/mk.po
index 4cd6dd3f..0f0889ff 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-01 01:13+0100\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <en@li.org>\n"
@@ -23,8 +23,8 @@ msgstr "конфигурационен волшебник"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Предупредување."
 
@@ -36,17 +36,17 @@ msgstr "Грешка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Честитки"
 
@@ -126,43 +126,43 @@ msgid "Warning"
 msgstr "Предупредување"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Грешка"
 
@@ -227,17 +227,6 @@ msgstr ""
 "Името на компјутерот треба да е целосно квалификациско име на домен. "
 "Вклучете го drakconnect за да го прилагодите."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Командата сеуште работи. Дали сакате да ја убиете и да го напуштите "
-"Волшебникот?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Затвори"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Волшебник"
@@ -328,8 +317,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "оневозможено"
 
@@ -337,8 +326,8 @@ msgstr "оневозможено"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "овозможено"
 
@@ -356,13 +345,13 @@ msgstr "Волшебникот успешно ги конфигурира DHCP �
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Неуспешно"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Повторно вклучете го drakwizard, и обидте се да сменете некои параметри."
@@ -686,19 +675,24 @@ msgstr "News сервер"
 msgid "NFS server"
 msgstr "NFS сервер"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab сервер"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard избор на волшебник"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Ве молиме изберете волшебник"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -707,7 +701,7 @@ msgstr ""
 "%s не е инсталиран\n"
 "За да инсталирате притиснете \"Наредно\" или \"Откажи\""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Инсталацијата не успеа"
 
@@ -1003,11 +997,6 @@ msgstr "Волшебник за конфигурирање на Kolab"
 msgid "Master kolab server"
 msgstr "Главен DNS сервер"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Секундарен DNS сервер"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1040,22 +1029,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Главен DNS сервер"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Веќе сте го конфигурирале вашиот Ldap сервер"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Секундарен DNS сервер"
@@ -1131,7 +1120,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1165,21 +1157,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab серверот е конфигуриран и работи. Најавете се како „manager“ со "
 "лозинката која ја внесовте на https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Конфигурирање на Kolab сервер на вашиот систем..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab сервер"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap волшебник"
@@ -1534,7 +1527,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директориум:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Патот што го наведовте не постои."
 
@@ -2194,7 +2187,7 @@ msgstr ""
 "прокси:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3870,19 +3863,19 @@ msgstr "Конфигурирање на FTP серверот ..."
 msgid "OpenSSH server"
 msgstr "Apache сервер"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Волшебник за време"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Пробај пак"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Зачувај ги поставките без тестирање"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3890,15 +3883,15 @@ msgstr ""
 "Овој волшебник ќе Ви помогне да поставите синхронизација помеѓу Вашиот и "
 "екстерен временски сервер."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Значи, Вашиот сервер ќе биде локален временски сервер за Вашата мрежа."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "притиснете „следно“ за да започенете или „откажи“ за да напуштите"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3906,35 +3899,35 @@ msgstr ""
 "(ви препорачуваме да го внесете овој сервер двапати pool.ntp.org бидејќи "
 "овој сервер постојано насочува кон достапни временски сервери)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Изберете основен и секундарен сервер од листата."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Временски сервери"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Основен временски сервер:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Секундарен временски сервер:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Изберете временска зона:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Изберете регион:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Изберете град:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3942,35 +3935,35 @@ msgstr ""
 "Ако временскиот сервер не е веднаш достапен (мрежа, или други причини), ќе "
 "има задоцнување околу 30 секунди."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Притиснете „следно“ за да почнете со тест на временскиот сервер."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Проверка на достапност на временските сервиси"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Часовна зона:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Временските сервиси не возвраќаат. Можни причини:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- непостоечки временски сервери"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- нема надворешна мрежа"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- други причини..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3978,11 +3971,11 @@ msgstr ""
 "Можете повторно да се обидете да контактирате со временските сервери, или да "
 "ја зачувате конфигурацијата без подесување на времето."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Поставките на временски сервер се зачувани"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Вашиот сервер сега може да биде временски сервер за Вашата локална мрежа."
@@ -4026,15 +4019,15 @@ msgstr ""
 "Вашиот сервер може да биде веб сервер за Вашата локална мрежа, и може да "
 "биде веб сервер за Интернет."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Овозможи го веб серверот за Интернет"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Овозможи го бев серверот за Интернет"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4045,11 +4038,11 @@ msgstr ""
 "vashserver.com/~korisnik, а за имињата на овие директориуми ќе бидете "
 "прашани подоцна."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Модули:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4059,7 +4052,7 @@ msgstr ""
 "директориуми \n"
 "достапни на вашиот http сервер преку http://www.vashserver.com/~korisnik."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4068,30 +4061,30 @@ msgstr ""
 "своите почетни директориуми (без ~/), за да бидат достапни преку http://www."
 "vashserver.com/~korisnik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Најпрво треба да подесите LDAP сервер."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "кориснички http под-директориум: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Внесете го патот на директориумот што сакате да биде главен содржател "
 "(document root)."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "главен директориум:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Конфигурирање на веб серверот"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4099,30 +4092,43 @@ msgstr ""
 "Вошебникот ги прибра следниве параметри, потребни за конфигурирање на Вашиот "
 "веб сервер"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Внатрешен веб сервер:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Интернет веб сервер:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Кориснички директориум:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Вошебникот успешно го конфигурира Вашиот интранет/Интернет веб сервер"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache сервер"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Конфигурирање на вашиот систем како Apache сервер ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Командата сеуште работи. Дали сакате да ја убиете и да го напуштите "
+#~ "Волшебникот?"
+
+#~ msgid "Close"
+#~ msgstr "Затвори"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Секундарен DNS сервер"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Домен на поштата:"
 
diff --git a/po/ms.po b/po/ms.po
index d6487677..19cb9369 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-04 00:53+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -22,8 +22,8 @@ msgstr "wizard konfigurasi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Amaran"
 
@@ -35,17 +35,17 @@ msgstr "Ralat."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Tahniah"
 
@@ -123,43 +123,43 @@ msgid "Warning"
 msgstr "Amaran"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Jika anda dalam dhcp, pelayan mungkin tidak berfungsi dengan tetapan anda."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Ralat"
 
@@ -214,15 +214,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Tutup"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Wizard DHCP"
@@ -305,8 +296,8 @@ msgstr "DHCP:"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "dimatikan"
 
@@ -314,8 +305,8 @@ msgstr "dimatikan"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "dihidupkan"
 
@@ -333,13 +324,13 @@ msgstr "Wizard berjaya menetapkan servis DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Gagal"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -628,26 +619,32 @@ msgstr "Pelayan berita"
 msgid "NFS server"
 msgstr "Pelayan NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "(%ld)PELAYAN >>> %s"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Pelayan FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Pemilih wizard Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Sila pilih wizard"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
@@ -933,11 +930,6 @@ msgstr "Jurucipta Konfigurasi Internet"
 msgid "Master kolab server"
 msgstr "Pelayan DNS induk"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Pelayan DNS hamba"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -963,22 +955,22 @@ msgstr "Pelayan Konfigurasikan"
 msgid "Master or slave Kolab server"
 msgstr "Pelayan DNS induk"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Internet FTP"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Pelayan DNS hamba"
@@ -1053,7 +1045,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1088,21 +1083,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Menetapkan pelayan PXE pada sistem anda..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "(%ld)PELAYAN >>> %s"
-
 #: ../ldap_wizard/Ldap.pm:32
 #, fuzzy
 msgid "Ldap wizard"
@@ -1485,7 +1479,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2139,7 +2133,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -3861,126 +3855,126 @@ msgstr "Menetapkan pelayan PXE pada sistem anda..."
 msgid "OpenSSH server"
 msgstr "Demon pelayan OpenSSH."
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 #, fuzzy
 msgid "Time wizard"
 msgstr " Wizard Kali Pertama"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 #, fuzzy
 msgid "Try again"
 msgstr "Sila cuba lagi"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 #, fuzzy
 msgid "Save config without test"
 msgstr "Simpan"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 #, fuzzy
 msgid "Thus your server will be the local time server for your network."
 msgstr "lokal."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 #, fuzzy
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Tekan maju untuk mula, atau Batal untuk meninggalkan wizard ini."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 #, fuzzy
 msgid "Select a primary and secondary server from the list."
 msgstr "dan."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Pelayan waktu"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 #, fuzzy
 msgid "Primary time server:"
 msgstr "Memulakan pelayan masa"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 #, fuzzy
 msgid "Secondary time server:"
 msgstr "Memulakan pelayan masa"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Tetapan zonmasa"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Negara / Kawasan"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Pilih secara manual"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 #, fuzzy
 msgid "Press next to start the time servers test."
 msgstr "mula."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zon waktu:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 #, fuzzy
 msgid "- no outside network"
 msgstr "_Tambah rangkaian baru"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 #, fuzzy
 msgid "- other reasons..."
 msgstr "Kemungkinan Punca"
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 #, fuzzy
 msgid "Time server configuration saved"
 msgstr "Comment=Konfigurasi Init yang Disimpan"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 #, fuzzy
 msgid "Your server can now act as a time server for your local network."
 msgstr "lokal."
@@ -4025,17 +4019,17 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr "Pelayan dan Pelayan Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "Enable the Web server for the intranet"
 msgstr "Pelayan"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Enable the Web server for the Internet"
 msgstr "Pelayan"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 #, fuzzy
 msgid ""
 "* User module: allows users to have a directory in their home directories "
@@ -4043,85 +4037,92 @@ msgid ""
 "be asked for the name of this directory afterward."
 msgstr "Pengguna direktori dalam onhttp://www.yourserver.com/~user direktori."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 #, fuzzy
 msgid "Modules:"
 msgstr "Modul Dimuatkan: \n"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr "Pengguna direktori dalam onhttp://www.yourserver.com/~user direktori."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 #, fuzzy
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr "Jenis direktori dalamhttp://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Anda mesti pertama sekali melaksanakan wizard pelayan DNS"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 #, fuzzy
 msgid "user http sub-directory: ~/"
 msgstr "Sila masukkan direktori pelayan HTTP."
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 #, fuzzy
 msgid "Type the path of the directory you want being the document root."
 msgstr "Jenis direktori."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 #, fuzzy
 msgid "Document root:"
 msgstr "Direktori _Root Dokumen:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 #, fuzzy
 msgid "Configuring the Web server"
 msgstr "Pelayan Web httpd"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Pelayan Web httpd"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 #, fuzzy
 msgid "Internet web server:"
 msgstr "Pelayan Web httpd"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Direktori pengguna:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 #, fuzzy
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Internet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Menetapkan sistem anda sebagai pelayan DNS Pembantu ..."
 
+#~ msgid "Close"
+#~ msgstr "Tutup"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Pelayan DNS hamba"
+
 #, fuzzy
 #~ msgid "Mail domain:"
 #~ msgstr "_Domain NIS:"
diff --git a/po/mt.po b/po/mt.po
index b97d48a8..fc59a510 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-09-10 06:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -26,8 +26,8 @@ msgstr "saħħar ta' konfigurazzjoni"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Twissija."
 
@@ -39,17 +39,17 @@ msgstr "Problema."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Prosit!"
 
@@ -125,43 +125,43 @@ msgid "Warning"
 msgstr "Twissija"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Int qiegħed fuq dhcp. Is-server jista' ma jaħdimx b'din il-konfigurazzjoni."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Problema"
 
@@ -224,15 +224,6 @@ msgstr ""
 "veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
 "(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Il-kmand għadu qed jaħdem. Triq tikkanċellah u toħroġ mis-Saħħar?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Agħlaq"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Saħħar DHCP"
@@ -324,8 +315,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "mitfi"
 
@@ -333,8 +324,8 @@ msgstr "mitfi"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "attivat"
 
@@ -352,13 +343,13 @@ msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Falla"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Erġa' ħaddem drakwizard, u ipprova ibdel xi parametri."
 
@@ -678,19 +669,24 @@ msgstr "Server \"news\":"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Server Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Għażla ta' saħħar DrakWizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Jekk jogħġbok agħżel saħħar"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -699,7 +695,7 @@ msgstr ""
 "%s m'hux installat\n"
 "Klikkja \"Li jmiss\" biex tinstalla jew \"Ikkanċella\" biex tieqaf"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installazzjoni falliet"
 
@@ -988,11 +984,6 @@ msgstr "Saħħar ta' konfigurazzjoni ta' Kolab"
 msgid "Master kolab server"
 msgstr "Server DNS ewlieni"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server NFS skjav"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1024,22 +1015,22 @@ msgstr "Merħba għas-saħħar ta' konfigurazzjoni ta' Kolab Groupware."
 msgid "Master or slave Kolab server"
 msgstr "Server DNS ewlieni"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Diġà għandek server LDAP konfigurat"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server NFS skjav"
@@ -1115,7 +1106,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1149,21 +1143,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Is-server Kolab issa huwa konfigurat u qed jaħdem. Illoggja bħala \"manager"
 "\" bil-password li għażilt, fuq https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Qed jiġi konfigurat is-server Kolab fuq is-sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Server Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Saħħar tas-Ldap"
@@ -1513,7 +1508,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direttorju:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Id-direttorju li għażilt ma jeżistix."
 
@@ -2169,7 +2164,7 @@ msgid ""
 msgstr "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura l-proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3839,19 +3834,19 @@ msgstr "Qed jiġi kkonfigurat is-server Samba..."
 msgid "OpenSSH server"
 msgstr "Server Apache:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Saħħar tal-ħin"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Erġa' pprova"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Ikteb il-konfigurazzjoni mingħajr test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3859,16 +3854,16 @@ msgstr ""
 "Is-saħħar jgħinek tissettja l-ħin tas-server sinkronizzat ma' server tal-ħin "
 "estern."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "B'hekk is-server tiegħek ikun is-server tal-ħin lokali għan-network tiegħek."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Agħfas Li jmiss biex tibda, jew Ikkanċella biex tħalli s-saħħar"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3876,35 +3871,35 @@ msgstr ""
 "(aħna nirrakkomandaw li tuża s-server pool.ntp.org għax dan is-server jaqleb "
 "fuq servers tal-ħin disponibbli)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Agħżel server ewlieni u sekondarju mil-lista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servers tal-ħin"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Server tal-ħin ewlieni:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Server tal-ħin sekondarju:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Agħżel żona orarja:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Agħżel reġjun:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Agħżel belt:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3912,35 +3907,35 @@ msgstr ""
 "Jekk is-server tal-ħin m'hux immedjatament disponibbli (minħabba network jew "
 "raġunijiet oħra), tistenna madwar 30 sekonda."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Agħfas \"Li jmiss\" biex tibda t-test ta' servers tal-ħin"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Qed tiġi ttestjata d-disponibbiltà tas-server tal-ħin"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Żona orarja:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Is-servers tal-ħin m'humiex jirrispondu. Ir-raġuni tista' tkun:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- servers tal-ħin ma jeżistux"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ebda konnessjoni man-network esterna"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- raġunijiet oħra..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3948,11 +3943,11 @@ msgstr ""
 "- Tista' terġa' tipprova tikkuntattja s-servers tal-ħin, jew tikteb il-"
 "konfigurazzjoni mingħajr ma tibdel il-ħin."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfigurazzjoni tas-server tal-ħin miktuba"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Is-server issa jista' jaħdem bħala server tal-ħin għan-network lokali tiegħek"
@@ -3994,15 +3989,15 @@ msgstr ""
 "Is-server jista' jaġixxi bħala web server għan-network interna (intranet), "
 "kif ukoll web server għall-internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Issettja web server għall-intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Issettja web server għall-internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4012,11 +4007,11 @@ msgstr ""
 "aċċessibbli mill-web server bħala http://www.server-tiegħek.com/~user. L-"
 "isem tad-direttorju jingħata wara."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduli:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4025,7 +4020,7 @@ msgstr ""
 "Ippermetti l-users ikollhom direttorju personali tagħhom \n"
 "aċċessibbli mill-web server bħala http://www.server-tiegħek.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4034,28 +4029,28 @@ msgstr ""
 "personali tagħhom sabiex ikun aċċessibbli bħala http://www.server-tiegħek."
 "com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "L-ewwel trid tissettja s-server LDAP."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Sottodirettorju http tal-users: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ittajpja d-direttorju li trid bħala għerq għad-dokumenti."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Direttorju ewlieni tad-dokumenti:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Qed jiġi kkonfigurat il-web server"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4063,30 +4058,41 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi kkonfigurat il-web "
 "server"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Web server għall-intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Web server tal-internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Direttorju tal-users:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Is-saħħar ikkonfiguralek il-web server tal-internet/intranet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Server Apache:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Qed tiġi kkonfigurata s-sistema bħala server Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Il-kmand għadu qed jaħdem. Triq tikkanċellah u toħroġ mis-Saħħar?"
+
+#~ msgid "Close"
+#~ msgstr "Agħlaq"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server NFS skjav"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Dominju tal-imejl:"
 
diff --git a/po/nb.po b/po/nb.po
index 40aaf9b5..43f5b451 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-08-31 10:22+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -35,8 +35,8 @@ msgstr "veiviser for å sette opp"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Advarsel."
 
@@ -48,17 +48,17 @@ msgstr "Feil."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulerer"
 
@@ -137,42 +137,42 @@ msgid "Warning"
 msgstr "Advarsel"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du er i dhcp, tjeneren vil muligens ikke virke med ditt oppsett."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Feil"
 
@@ -235,16 +235,6 @@ msgstr ""
 "domenenavn, ikke likt localdomain eller intet. Vertsnavn må være et FQDN: "
 "Fully Qualified Domain Name. Kjør drakconnect for å endre det."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Denne kommandoen kjører fortsatt. Vil du kille den og avslutte veiviseren?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Lukk"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP-veiviser"
@@ -335,8 +325,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "deaktivert"
 
@@ -344,8 +334,8 @@ msgstr "deaktivert"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aktivert"
 
@@ -363,13 +353,13 @@ msgstr "Veiviseren satte vellykket opp DHCP-tjenestene."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Feilet"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard på nytt, og prøv å endre noen parametre."
 
@@ -683,19 +673,24 @@ msgstr "Nyhetstjener"
 msgid "NFS server"
 msgstr "NFS-tjener"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab-tjener"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-tjener"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard veiviservalg"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Velg en veiviser"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -704,7 +699,7 @@ msgstr ""
 "%s er ikke installert\n"
 "Klikk \"Neste\" for å installere eller \"Avbryt\" for å avslutte"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
@@ -978,11 +973,6 @@ msgstr "Veiviser for å sette opp Kolab"
 msgid "Master kolab server"
 msgstr "Master DNS-tjener"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Slave DNS-tjener"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1014,22 +1004,22 @@ msgstr "Velkommen til veiviseren for å sette opp Kolab Gruppevare-tjener"
 msgid "Master or slave Kolab server"
 msgstr "Master DNS-tjener"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Du har allerede satt opp din Ldap-tjener"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Slave DNS-tjener"
@@ -1104,7 +1094,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1138,21 +1131,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab-tjeneren er nå satt opp og kjører. Logg inn som 'manager' med "
 "passordet du tastet inn på https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-tjener på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab-tjener"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap-veiviser"
@@ -1504,7 +1498,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Stien du entret eksisterer ikke."
 
@@ -2165,7 +2159,7 @@ msgstr ""
 "Veiviseren samlet følgende parametere som trengs for å sette opp proxyen din:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3813,19 +3807,19 @@ msgstr "Setter opp din OpenSSH-tjener..."
 msgid "OpenSSH server"
 msgstr "OpenSSH-tjener"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tid-veiviser"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Prøv igjen"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Lagre oppsett uten test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3833,16 +3827,16 @@ msgstr ""
 "Denne veiviseren vil hjelpe deg med å sette tiden til tjeneren din "
 "synkronisert med en ekstern tid-tjener."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Derfor vil tjeneren din være den lokale tid-tjeneren for nettverket ditt."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Trykk neste for å starte, eller Avbryt for å avslutte denne veiviseren"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3850,35 +3844,35 @@ msgstr ""
 "(vi anbefaler at du bruker tjeneren pool.ntp.org to ganger siden denne "
 "tjeneren peker tilfeldig til tilgjengelige tidstjenere)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Velg en primær eller sekundær tjener fra listen."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tid-tjenere"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primær tid-tjener:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundær tid-tjener:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Velg en tidsone"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Velg en region:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Velg et land:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3886,35 +3880,35 @@ msgstr ""
 "Hvis tid-tjeneren ikke er øyeblikkelig tilgjengelig (nettverk eller annen "
 "grunn), vil du vente ca. 30 sekunder."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Trykke Neste for å starte test av tid-tjenere."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Tester tilgjengelighet for tid-tjenerene"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Tidsone:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Tid-tjenerene svarer ikke. Mulige grunner kan være:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ikke eksisterende tid-tjenere"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ingen nettverk på utsiden"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- andre grunner..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3922,11 +3916,11 @@ msgstr ""
 "- Du kan prøve igjen å kontakte tids-tjenere eller lagre oppsettet uten å "
 "faktisk sette tid."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Tid-tjeneroppsett lagret"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Tjeneren din kan nå opptre som en tid-tjener for ditt lokale nettverk. "
@@ -3971,15 +3965,15 @@ msgstr ""
 "Din tjener kan opptre som en web-tjener mot ditt interne nettverk "
 "(intranett) og som en web-tjener for Internett."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Aktiver web-tjeneren for Intranettet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Aktiver web-tjeneren for Internett"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3989,11 +3983,11 @@ msgstr ""
 "http tjeneren din via http://www.yourserver.com/~user, du vil bli spurt "
 "etter navnet på dette området etterpå."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduler:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4001,7 +3995,7 @@ msgstr ""
 "Tillater brukere å ha en katalog i deres hjemmeområder tilgjengelig på ttp-"
 "tjeneren din via http://www.dintjener.com/~bruker."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4009,28 +4003,28 @@ msgstr ""
 "Skriv navnet på området brukere skal opprette i sine hjem (uten ~/) for å få "
 "det tilgjengelig via http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Du må spesifisere det lokale internettdomenenavnet."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "bruker http underområde: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Skriv stien til området du ønsker skal være dokument-root."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokument-root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigurerer web-tjeneren"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4038,30 +4032,42 @@ msgstr ""
 "Veiviseren samlet følgende parametere som trengs for å sette opp web-"
 "tjeneren din"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranett web-tjener:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internett web-tjener:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Brukerområde:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Veiviseren satte vellykket opp din Intranett/Internett web-tjener "
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache-tjener"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer ditt system som en Apache-tjener ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Denne kommandoen kjører fortsatt. Vil du kille den og avslutte veiviseren?"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Slave DNS-tjener"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Epostdomene:"
 
diff --git a/po/nl.po b/po/nl.po
index 79eb1d94..feca5478 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-10-11 17:56+0100\n"
 "Last-Translator: hkc <hkc@i-detect.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -25,8 +25,8 @@ msgstr "Configuratiewizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Waarschuwing."
 
@@ -38,17 +38,17 @@ msgstr "Fout."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
@@ -129,44 +129,44 @@ msgid "Warning"
 msgstr "Waarschuwing"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "U heeft voor DHCP gekozen, de server werkt misschien niet goed met uw "
 "instellingen."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fout opgetreden"
 
@@ -234,17 +234,6 @@ msgstr ""
 "gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan te "
 "passen."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Nog bezig opdracht uit te voeren. Wilt u deze opdracht stoppen en de Wizard "
-"afsluiten?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Sluiten"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Wizard"
@@ -336,8 +325,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "uitgezet"
 
@@ -345,8 +334,8 @@ msgstr "uitgezet"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aangezet"
 
@@ -364,13 +353,13 @@ msgstr "De wizard heeft de DHCP-dienst op uw server succesvol ingesteld."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Mislukt"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard opnieuw en probeer het met andere gegevens."
 
@@ -691,19 +680,24 @@ msgstr "Newsserver"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard wizard selecteren"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Kies een wizard"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -712,7 +706,7 @@ msgstr ""
 "%s is niet geïnstalleerd\n"
 "Klik op \"Volgende\" om te installeren of \"Annuleren\" om af te sluiten"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installatie is mislukt"
 
@@ -1006,11 +1000,6 @@ msgstr "Kolab-configuratiewizard"
 msgid "Master kolab server"
 msgstr "Primaire DNS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Secundaire DNS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1042,22 +1031,22 @@ msgstr "Welkom bij de Kolab Groupware server-configuratiewizard"
 msgid "Master or slave Kolab server"
 msgstr "Primaire DNS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "U heeft uw Ldap server reeds geconfigureerd."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Secundaire DNS server"
@@ -1133,7 +1122,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1167,21 +1159,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "De Kolab-server is nu geconfigureerd en actief. Meldt u aan als 'manager' "
 "met het wachtwoord dat u heeft ingevoerd op https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Bezig met configureren van de Kolab server op uw systeem..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap wizard"
@@ -1533,7 +1526,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Het ingevoerde pad bestaat niet."
 
@@ -2198,7 +2191,7 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw proxy te configureren:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3858,19 +3851,19 @@ msgstr "De Samba server wordt geconfigureerd..."
 msgid "OpenSSH server"
 msgstr "Apache webserver:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tijd wizard"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Probeer opnieuw"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Instellingen opslaan zonder te testen"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3878,16 +3871,16 @@ msgstr ""
 "Deze wizard helpt u bij het instellen van de tijd op uw server, "
 "gesynchroniseerd met een externe tijdserver."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Uw server zal dan dienen als lokale tijdserver voor uw netwerk."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Kies Volgende om te beginnen, of Annuleren om deze wizard te beëindigen"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3895,35 +3888,35 @@ msgstr ""
 "(we raden aan om in beide gevallen de pool.ntp.org server te gebruiken omdat "
 "deze server willekeurig naar beschikbare tijdservers verwijst)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Kies een primaire en secundaire server uit de lijst."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tijdservers"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primaire tijdserver:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Secundaire tijdserver:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Kies een tijdzone:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Kies een regio:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Kies een stad:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3931,35 +3924,35 @@ msgstr ""
 "Wanneer de tijdserver niet meteen beschikbaar is (vanwege het netwerk of "
 "iets anders), is er een vertraging van ongeveer 30 seconden."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Klik op Volgende om de tijdservertest te starten."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testen van de beschikbaarheid van de tijdservers"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Tijdzone:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "De tijdservers reageren niet. De redenen hiervoor kunnen zijn:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- niet bestaande tijdservers"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- geen extern netwerk"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- andere redenen..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3967,11 +3960,11 @@ msgstr ""
 "U kunt upnieuw proberen contact op te nemen met een tijdserver, of de "
 "configuratie bewaren zonder de tijd in te stellen."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Tijd server configuratie bewaard"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Uw server kan nu dienen als tijdserver voor uw lokale netwerk."
 
@@ -4013,15 +4006,15 @@ msgstr ""
 "Uw server kan dienen als web server voor uw interne netwerk (intranet) en "
 "als een web server voor internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Activeer de web server voor het Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Activeer de webserver voor het internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4031,11 +4024,11 @@ msgstr ""
 "die op uw http server beschikbaar is via http://www.uwserver.com/~gebruiker. "
 "U zult later worden gevraagd naar de naam van deze map."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modules:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4044,7 +4037,7 @@ msgstr ""
 "Staat gebruikers toe om een map in gebruikersmappen beschikbaar te maken op "
 "de http server via http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4053,28 +4046,28 @@ msgstr ""
 "persoonlijke map (zonder ~/) om hem bereikbaar te maken via http://www."
 "uwserver.com/~gebruiker"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "U dient eerst een LDAP server te configureren"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "http sub-directory gebruiker: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Voer het pad van de map in dat u als document hoofdmap wilt instellen."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document hoofdmap:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "De webserver configureren"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4082,31 +4075,44 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw web server te "
 "configureren"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet webserver:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet webserver:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Gebruikersmap:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "De wizard heeft uw intranet/internet web server succesvol geconfigureerd"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache webserver:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "De computer wordt als Apache webserver geconfigureerd ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Nog bezig opdracht uit te voeren. Wilt u deze opdracht stoppen en de "
+#~ "Wizard afsluiten?"
+
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Secundaire DNS server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "E-maildomein:"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 331de9ed..5520591c 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-03-13 20:15+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: PLT <punlinux-i18n@list.sourceforge.net>\n"
@@ -22,8 +22,8 @@ msgstr "ਸੰਰਚਨਾ ਤਖਤੀ"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "ਚੇਤਾਵਨੀ।"
 
@@ -35,17 +35,17 @@ msgstr "ਗਲਤੀ।"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "ਮੁਬਾਰਕਾਂ"
 
@@ -118,42 +118,42 @@ msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
@@ -213,15 +213,6 @@ msgstr ""
 "ਹੈ, ਲੋਕਲ-ਡੋਮੇਨ ਜਾਂ ਹੋਰ ਦੇ ਸਮਾਨ ਨਾ ਹੋਵੇ। ਮੇਜ਼ਬਾਨ ਨਾਂ FQDN ਹੋਣਾ ਜਰੂਰੀ ਹੈ: ਪੂਰਾ ਨਿਰਧਾਰਿਤ ਡੋਮੇਨ-"
 "ਨਾਂ। ਇਸ ਨੂੰ ਅਨੁਕੂਲ ਕਰਨ ਲਈ drakconnect ਚਲਾਓ।"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "ਕਮਾਂਡ ਹਾਲੇ ਚੱਲ ਰਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦਾ ਅੰਤ ਕਰਨਾ ਹੈ ਅਤੇ ਤਖਤੀ ਚੋਂ ਬਾਹਰ ਜਾਣਾ ਹੈ?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "ਬੰਦ"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP ਤਖਤੀ"
@@ -305,8 +296,8 @@ msgstr "ਤਖਤੀ ਨੇ ਤੁਹਾਡੀ DHCP ਸੇਵਾ ਸੰਰਚਨ
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "ਅਯੋਗ"
 
@@ -314,8 +305,8 @@ msgstr "ਅਯੋਗ"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "ਯੋਗ"
 
@@ -333,13 +324,13 @@ msgstr "ਤਖਤੀ ਨੇ ਸਫਲਤਾ ਨਾਲ DHCP ਸੇਵਾਵਾਂ
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "ਅਸਫਲ"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizard ਮੁੜ ਚਲਾਓ, ਅਤੇ ਕੁਝ ਪੈਰਾਮੀਟਰ ਤਬਦੀਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
@@ -647,19 +638,24 @@ msgstr "ਨਿਊਜ਼ ਸਰਵਰ"
 msgid "NFS server"
 msgstr "NFS ਸਰਵਰ"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab ਸਰਵਰ"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP ਸਰਵਰ"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard ਤਖਤੀ ਚੋਣ"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਖਤੀ ਚੁਣੋ"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -668,7 +664,7 @@ msgstr ""
 "%s ਇੰਸਟਾਲ ਨਹੀਂ\n"
 "ਇੰਸਟਾਲ ਕਰਨ ਲਈ \"Next\" ਜਾਂ ਬਾਹਰ ਜਾਣ ਲਈ \"Cancel\" ਦਬਾਓ"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
@@ -946,11 +942,6 @@ msgstr "Kolab ਸੰਰਚਨਾ ਤਖਤੀ"
 msgid "Master kolab server"
 msgstr "ਮਾਸਟਰ DNS ਸਰਵਰ"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "ਸਲੇਵ DNS ਸਰਵਰ"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -980,22 +971,22 @@ msgstr "Kolab ਗਰੁੱਪਵੇਅਰ ਸਰਵਰ ਸੰਰਚਨਾ ਤਖ
 msgid "Master or slave Kolab server"
 msgstr "ਮਾਸਟਰ DNS ਸਰਵਰ"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ Ldap ਸਰਵਰ ਸੰਰਚਿਤ ਕੀਤਾ ਹੈ"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "ਸਲੇਵ DNS ਸਰਵਰ"
@@ -1071,7 +1062,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1105,21 +1099,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "kolab ਸਰਵਰ ਹੁਣ ਸੰਰਚਿਤ ਹੈ ਅਤੇ ਚੱਲ ਰਿਹਾ ਹੈ। ਗੁਪਤ-ਕੋਡ ਜੋ ਤੁਸੀਂ https://127.0.0.1/kolab/"
 "admin/ ਤੇ ਦਿੱਤਾ ਸੀ ਨਾਲ 'ਪ੍ਰਬੰਧਕ' ਤੌਰ ਤੇ ਲਾਗਇਨ ਕਰੋ।"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ Kolab ਸਰਵਰ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab ਸਰਵਰ"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap ਤਖਤੀ"
@@ -1461,7 +1456,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਮਾਰਗ ਮੌਜੂਦ ਨਹੀਂ।"
 
@@ -2095,7 +2090,7 @@ msgid ""
 msgstr "ਤਖਤੀ ਨੇ ਤੁਹਾਡਾ ਪਰਾਕਸੀ ਸੰਰਚਿਤ ਕਰਨ ਲਈ ਲੋੜੀਂਦੇ ਹੇਠਲੇ ਪੈਰਾਮੀਟਰ ਇਕੱਠੇ ਕੀਤੇ ਹਨ:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3732,34 +3727,34 @@ msgstr "ਸਾਂਬਾ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹ�
 msgid "OpenSSH server"
 msgstr "Apache ਸਰਵਰ"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "ਸਮਾਂ ਤਖਤੀ"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "ਜਾਂਚ ਤੋਂ ਬਿਨਾ ਸੰਰਚਨਾ ਸੰਭਾਲੋ"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 "ਇਹ ਤਖਤੀ ਤੁਹਾਨੂੰ ਬਾਹਰੀ ਸਮਾਂ ਸਰਵਰ ਨਾਲ ਆਪਣੀ ਸਰਵਰ ਸਮਕਾਲਤਾ ਨਿਰਧਾਰਿਤ ਕਰਨ ਲਈ ਮਦਦ ਕਰੇਗੀ।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "ਇਸ ਲਈ ਤੁਹਾਡਾ ਸਰਵਰ ਨੈੱਟਵਰਕ ਲਈ ਲੋਕਲ ਸਮਾਂ ਸਰਵਰ ਹੋਵੇਗਾ।"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅੱਗੇ, ਜਾਂ ਤਖਤੀ ਛੱਡਣ ਲਈ ਰੱਦ ਕਰੋ ਦਬਾਓ"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3767,69 +3762,69 @@ msgstr ""
 "(ਉਪਲੱਬਧ ਸਮਾਂ ਸਰਵਰਾਂ ਨੂੰ ਲਗਾਤਾਰ ਦਰਸਾਉਣ ਲਈ ਸਰਵਰ pool.ntp.org ਦੋ ਵਾਰ ਵਰਤਣ ਲਈ ਸਾਡਾ ਉਦੇਸ਼ "
 "ਹੈ)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "ਸੂਚੀ ਵਿੱਚੋਂ ਪ੍ਰਾਇਮਰੀ ਅਤੇ ਸੈਕੰਡਰੀ ਸਰਵਰ ਚੁਣੋ।"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "ਸਮਾਂ ਸਰਵਰ"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "ਪ੍ਰਾਇਮਰੀ ਸਮਾਂ ਸਰਵਰ:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "ਸੈਕੰਡਰੀ ਸਮਾਂ ਸਰਵਰ:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "ਸਮਾਂ-ਜ਼ੋਨ ਚੁਣੋ"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "ਖੇਤਰ ਚੁਣੋ:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "ਸ਼ਹਿਰ ਚੁਣੋ:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr "ਜੇ ਸਮਾਂ ਸਰਵਰ ਤੁਰੰਤ ਉਪਲੱਬਧ ਨਹੀਂ (ਨੈੱਟਵਰਕ ਜਾਂ ਹੋਰ ਕਾਰਨ), ਇਸ ਦਾ 30 ਸਕਿੰਟ ਅੰਤਰਾਲ ਹੋਵੇਗਾ।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "ਸਮਾਂ ਸਰਵਰ ਜਾਂਚ ਚਲਾਉਣ ਲਈ ਅੱਗੇ ਦਬਾਓ।"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "ਸਮਾਂ ਸਰਵਰ ਉਪਲੱਬਧਤਾ ਦੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "ਸਮਾਂ ਜ਼ੋਨ:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "ਸਮਾਂ ਸਰਵਰ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ। ਕਾਰਨ ਹੋ ਸਕਦਾ ਹੈ:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ਨਾ ਮੌਜੂਦ ਸਮਾਂ ਸਰਵਰ"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ਕੋਈ ਬਾਹਰੀ ਨੈੱਟਵਰਕ ਨਹੀਂ"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- ਹੋਰ ਕਾਰਨ..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3837,11 +3832,11 @@ msgstr ""
 "- ਤੁਸੀਂ ਸਮਾਂ ਸਰਵਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਲਈ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰ, ਜਾਂ ਅਸਲ ਵਿੱਚ ਸਮਾਂ ਨਿਰਧਾਰਿਤ ਕੀਤੇ ਬਿਨਾ "
 "ਸੰਰਚਨਾ ਸੰਭਾਲ ਸਕਦੇ ਹੋ।"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "ਸਮਾਂ ਸਰਵਰ ਸੰਰਚਨਾ ਸੰਭਾਲੀ ਗਈ"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "ਤੁਹਾਡਾ ਸਰਵਰ ਹੁਣ ਲੋਕਲ ਨੈੱਟਵਰਕ ਲਈ ਸਮਾਂ ਸਰਵਰ ਤੌਰ ਤੇ ਕੰਮ ਕਰ ਸਕਦਾ ਹੈ।"
 
@@ -3882,15 +3877,15 @@ msgstr ""
 "ਤੁਹਾਡਾ ਸਰਵਰ ਤੁਹਾਡੇ ਅੰਦਰੂਨੀ ਨੈੱਟਵਰਕ (ਇੰਟਰਾਨੈੱਟ) ਲਈ ਅਤੇ ਇੰਟਰਨੈੱਟ ਲਈ ਵੈਬ ਸਰਵਰ ਤੌਰ ਤੇ ਕੰਮ ਕਰ ਸਕਦਾ "
 "ਹੈ।"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "ਇੰਟਰਾਨੈੱਟ ਲਈ ਵੈਬ ਸਰਵਰ ਯੋਗ ਕਰੋ"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "ਇੰਟਰਨੈੱਟ ਲਈ ਵੈਬ ਸਰਵਰ ਯੋਗ ਕਰੋ"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3900,11 +3895,11 @@ msgstr ""
 "ਨੂੰ ਆਪਣੀਆਂ ਘਰ ਡਾਇਰੈਕਟਰੀਆਂ ਵਿੱਚ ਡਾਇਰੈਕਟਰੀਆਂ ਉਪਲੱਬਧ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ, ਤੁਹਾਨੂੰ ਬਾਅਦ ਵਿੱਚ "
 "ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਬਾਰੇ ਪੁੱਛਿਆ ਜਾਵੇਗਾ।"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "ਮੈਡਿਊਲ:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3913,7 +3908,7 @@ msgstr ""
 "ਤੁਹਾਡੇ http ਸਰਵਰ ਤੇ http://www.yourserver.com/~user ਦੁਆਰਾ ਉਪਭੋਗੀਆਂ ਨੂੰ \n"
 "ਆਪਣੀਆਂ ਘਰ ਡਾਇਰੈਕਟਰੀਆਂ ਵਿੱਚ ਡਾਇਰੈਕਟਰੀਆਂ ਉਪਲੱਬਧ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3921,57 +3916,68 @@ msgstr ""
 "ਉਪਭੋਗੀਆਂ ਨੂੰ http://www.yourserver.com/~user ਦੁਆਰਾ ਉਪਲੱਬਧ ਕਰਨ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ "
 "(~/) ਵਿੱਚ ਬਣਾਉਣ ਲਈ ਡਾਇਰੈਕਟਰੀ ਦਾ ਨਾਂ ਲਿਖੋ"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ Ldap ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਜਰੂਰੀ ਹੈ।"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "ਉਪਭੋਗੀ http ਉਪ-ਡਾਇਰੈਕਟਰੀ: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "ਡਾਇਰੈਕਟਰੀ ਜੋ ਤੁਸੀਂ ਦਸਤਾਵੇਜ਼ root ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ ਦਾ ਮਾਰਗ ਦਿਓ।"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "ਦਸਤਾਵੇਜ਼ root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "ਵੈਬ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "ਤਖਤੀ ਤੁਹਾਡਾ ਵੈਬ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰਨ ਲਈ ਲੋੜੀਂਦੇ ਹੇਠਲੇ ਪੈਰਾਮੀਟਰ ਇਕੱਠੇ ਕੀਤੇ ਹਨ"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "ਇੰਟਰਾਨੈੱਟ ਵੈਬ ਸਰਵਰ:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "ਇੰਟਰਨੈੱਟ ਵੈਬ ਸਰਵਰ:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "ਉਪਭੋਗੀ ਡਾਇਰੈਕਟਰੀ:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "ਤਖਤੀ ਨੇ ਤੁਹਾਡਾ ਇੰਟਰਾਨੈੱਟ/ਇੰਟਰਨੈੱਟ ਵੈਬ ਸਰਵਰ ਸਫਲਤਾ ਨਾਲ ਸੰਰਚਿਤ ਕੀਤਾ ਹੈ"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache ਸਰਵਰ"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਨੂੰ Apache ਸਰਵਰ ਤੌਰ ਤੇ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "ਕਮਾਂਡ ਹਾਲੇ ਚੱਲ ਰਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਦਾ ਅੰਤ ਕਰਨਾ ਹੈ ਅਤੇ ਤਖਤੀ ਚੋਂ ਬਾਹਰ ਜਾਣਾ ਹੈ?"
+
+#~ msgid "Close"
+#~ msgstr "ਬੰਦ"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "ਸਲੇਵ DNS ਸਰਵਰ"
+
 #~ msgid "Mail domain:"
 #~ msgstr "ਪੱਤਰ ਡੋਮੇਨ:"
 
diff --git a/po/pl.po b/po/pl.po
index dd0282ff..e1afb0db 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-04 19:46+0200\n"
 "Last-Translator: Tomasz Bednarski <tomasz.bednarski@mandriva.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -29,8 +29,8 @@ msgstr "druid konfiguracyjny"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Ostrzeżenie."
 
@@ -42,17 +42,17 @@ msgstr "Błąd."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulacje"
 
@@ -128,42 +128,42 @@ msgid "Warning"
 msgstr "Ostrzeżenie"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Błąd"
 
@@ -226,15 +226,6 @@ msgstr ""
 "zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa Domeny). "
 "Uruchom polecenie drakconnect, aby ją ustawić."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Polecenie nadal działa. Czy chcesz je zatrzymać i opuścić Druida?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zamknij"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Druid DHCP"
@@ -323,8 +314,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "wyłączone"
 
@@ -332,8 +323,8 @@ msgstr "wyłączone"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "włączone"
 
@@ -351,13 +342,13 @@ msgstr "Druid z powodzeniem skonfigurował usługi DHCP serwera."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Niepowodzenie"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Uruchom ponownie program drakwizard i spróbuj zmienić niektóre parametry."
@@ -675,19 +666,24 @@ msgstr "Serwer grup dyskusyjnych"
 msgid "NFS server"
 msgstr "Serwer NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Serwer Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Serwer FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard - wybór druida"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Wybierz druida"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -696,7 +692,7 @@ msgstr ""
 "Pakiet %s nie jest zainstalowany\n"
 "Kliknij \"Dalej\" aby go zainstalować lub \"Anuluj aby zakończyć"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
@@ -970,10 +966,6 @@ msgstr "Druid konfiguracji Kolab"
 msgid "Master kolab server"
 msgstr "Podstawowy serwer Kolab"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Podrzędny serwer Kolab"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1004,11 +996,11 @@ msgstr "Witaj w druidzie konfiguracji serwera do pracy grupowej Kolab."
 msgid "Master or slave Kolab server"
 msgstr "Podstawowy lub podrzędny serwer Kolab"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Wybrałeś podstawowy serwer Kolab"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
@@ -1016,12 +1008,12 @@ msgstr ""
 "Wprowadź pełną nazwę komputera pełniącego rolę podrzędnego serwera Kolab np. "
 "tenhost.domena.pl (zostaw puste jeżeli brak domeny)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Wybrałeś konfigurację podstawowego serwera Kolab"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Podrzędny serwer Kolab:"
 
@@ -1100,8 +1092,15 @@ msgstr ""
 "dla serwera Kolab"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Wprowadź długie hasło dla CA i długie hasło dla klucza RSA."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab może utworzyć i zarządzać ośrodkiem certyfikacji, który może być "
+"wykorzystany do tworzenia certyfikatów SSL wykorzystywanych w środowisku "
+"Kolaba."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1133,21 +1132,22 @@ msgid "With CA"
 msgstr "Z CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Serwer kolab jest już skonfigurowany i pracuje. Zaloguj się jako \"manager\" "
 "z wprowadzonym hasłem na https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguracja serwera Kolab w systemie..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Serwer Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Druid Samby"
@@ -1497,7 +1497,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Podana ścieżka nie istnieje."
 
@@ -2161,7 +2161,7 @@ msgstr ""
 "pośrednika:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3838,19 +3838,19 @@ msgstr "Konfiguracja serwera OpenSSH..."
 msgid "OpenSSH server"
 msgstr "Serwer OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Druid czasu"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Spróbuj ponownie"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Zapisz konfigurację bez testowania"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3858,15 +3858,15 @@ msgstr ""
 "Ten druid pomoże ci w ustawieniu czasu serwera zsynchronizowanego z "
 "zewnętrznym serwerem czasu."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Ten serwer będzie serwerem lokanym czasu dla twojej sieci."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Naciśnij dalej aby rozpocząć, lub Anuluj aby opuścić druida"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3874,35 +3874,35 @@ msgstr ""
 "(zalecane jest użycie dwukrotnie adresu pool.ntp.org jako serwera losowo "
 "wskazującego na dostępne serwery czasu)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Wybierz podstawowy i zapasowy serwer z listy."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Serwery czasu"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Podstawowy serwer czasu:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Zapasowy serwer czasu:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Wybierz strefę czasową"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Wybierz region:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Wybierz kraj:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3910,35 +3910,35 @@ msgstr ""
 "Jeśli serwer czasu nie jest natychmiast dostępny (sieć lub inny powód), "
 "należy poczekać około 30 sekund."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Naciśnij dalej aby uruchomić test serwerów czasu."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testowanie dostępności serwerów czasu"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Strefa czasowa:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Serwery czasu nie odpowiadają. Powodem może być:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- nieistniejące serwery czasu"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- bez sieci zewnętrznej"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- inne powody..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3946,11 +3946,11 @@ msgstr ""
 "- Można spróbować ponownie nawiązać połączenie z serwerami czasu, lub też "
 "zapisać konfigurację bez aktualnie ustawionego czasu."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Zapisano konfigurację serwera czasu"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Twój serwer może teraz pracować jako serwer czasu dla twojej sieci lokalnej."
@@ -3992,15 +3992,15 @@ msgstr ""
 "Twój serwer może pracować jako serwer WWW dla twojej sieci wewnętrzej "
 "(intranet) lub jako serwer WWW dla Internetu."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Włącz serwer WWW dla Intranetu"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Włącz serwer WWW dla Internetu"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4010,11 +4010,11 @@ msgstr ""
 "domowych dostępnych na serwerze http przez http://www.twojserwer.com/"
 "~użytkownik, zostanie wyświetlone zapytanie o nazwę tego katalogu."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduły:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4022,7 +4022,7 @@ msgstr ""
 "Udostępnia użytkownikom katalogi w ich katalogach domowychdostępnych na "
 "serwerze http przez http://www.twojserwer.com/~uzytkownik."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4031,58 +4031,71 @@ msgstr ""
 "katalogach domowych (bez ~/) aby były one widoczne na http://www.twojserwer."
 "com/~użytkownik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Wprowadź internetową nazwę domeny."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "podkatalog http użytkownika: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Podaj ścieżkę do katalogu, który ma być katalogiem głównym dokumentów."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Główny katalog dokumentów:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfiguracja serwera webowego"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 "Druid zebrał poniższe parametry wymagane do konfiguracji twojego serwera WWW"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranetowy serwer www:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internetowy serwer www:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Katalog użytkownika:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Druid pomyślnie skonfigurował twój serwer WWW Intranetowy/Internetowy"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Serwer Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguracja systemu jako serwera Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Polecenie nadal działa. Czy chcesz je zatrzymać i opuścić Druida?"
+
+#~ msgid "Close"
+#~ msgstr "Zamknij"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Podrzędny serwer Kolab"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr "Wprowadź długie hasło dla CA i długie hasło dla klucza RSA."
+
 #~ msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
 #~ msgstr "Wprowadź długie hasło dla CA i długie hasło dla klucza RSA."
 
diff --git a/po/pt.po b/po/pt.po
index 81de2cb7..76c802f5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-06 22:53+0200\n"
 "Last-Translator: Jose JORGE <jjorge@free.fr>\n"
 "Language-Team: pt_PT\n"
@@ -37,8 +37,8 @@ msgstr "assistente de configuração"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Aviso."
 
@@ -50,17 +50,17 @@ msgstr "Erro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -94,7 +94,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Este assistente irá ajuda-lo a adicionar um novo cliente no seu DNS local."
+msgstr ""
+"Este assistente irá ajuda-lo a adicionar um novo cliente no seu DNS local."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -137,42 +138,42 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Erro"
 
@@ -236,14 +237,6 @@ msgstr ""
 "Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). Execute o "
 "drakconnect para o ajustar."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "O comando ainda está a correr. Deseja matá-lo e sair do assistente?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Fechar"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Assistente DHCP"
@@ -258,7 +251,8 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Este assistente irá ajuda-lo a configurar os serviços DHCP do seu servidor."
+msgstr ""
+"Este assistente irá ajuda-lo a configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
@@ -332,8 +326,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "desactivado"
 
@@ -341,8 +335,8 @@ msgstr "desactivado"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "activado"
 
@@ -360,13 +354,13 @@ msgstr "O assistente configurar com sucesso os serviços DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Falhou"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Relance o drakwizard, e tente modificar alguns parâmetros."
 
@@ -509,7 +503,8 @@ msgid "Default domain name to search:"
 msgstr "Nome de domínio padrão para procurar:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Isto não é um endereço IP válido para o seu reenviador... prima seguinte "
 "para continuar"
@@ -554,7 +549,8 @@ msgstr ""
 "favor execute o Assistente DNS: Servidor DNS Master."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Parece que não é um servidor DNS master, então não é possível adicionar/"
 "remover o endereço."
@@ -584,8 +580,10 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "O cliente com esta identificação será removido do seu DNS"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
-msgstr "O servidor DNS está prestes a ser configurado com a seguinte configuração"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
+msgstr ""
+"O servidor DNS está prestes a ser configurado com a seguinte configuração"
 
 #: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
@@ -680,19 +678,24 @@ msgstr "Servidor de Notícias"
 msgid "NFS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servidor Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selecção do assistente Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Por favor escolha um assistente"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -701,7 +704,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em  \"Seguinte\"para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
@@ -715,7 +718,8 @@ msgstr "Assistente de Configuração do Servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:78
 msgid "This wizard will help you configuring an FTP server for your network."
-msgstr "Este assistente irá ajudá-lo a configurar um servidor FTP para a sua rede."
+msgstr ""
+"Este assistente irá ajudá-lo a configurar um servidor FTP para a sua rede."
 
 #: ../ftp_wizard/Proftpd.pm:84
 msgid "Select the kind of FTP service you want to activate:"
@@ -794,7 +798,8 @@ msgstr "Permitir FXP: permite a transferência de ficheiros via outro FTP."
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "Chroot home user: users will only see their home directory."
-msgstr "Chroot home user: os utilizadores irão apenas ver o seu directório pessoal."
+msgstr ""
+"Chroot home user: os utilizadores irão apenas ver o seu directório pessoal."
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "FTP server options, step 2"
@@ -874,7 +879,8 @@ msgstr "Permitir FXP"
 
 #: ../ftp_wizard/Proftpd.pm:167
 msgid "The wizard successfully configured your intranet/Internet FTP server"
-msgstr "O assistente configurou com sucesso o seu servidor FTP Intranet/Internet"
+msgstr ""
+"O assistente configurou com sucesso o seu servidor FTP Intranet/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
@@ -888,7 +894,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Configure um servidor de instalação (via NFS e http)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr ""
 "Configure fácilmente um directório de instalação do servidor, com acesso NFS "
 "e HTTP."
@@ -935,7 +942,8 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:82
 msgid "The destination directory is already in use. Please choose another one."
-msgstr "O directório de destino já ser encontra em uso. Por favor escolha outro."
+msgstr ""
+"O directório de destino já ser encontra em uso. Por favor escolha outro."
 
 #: ../installsrv_wizard/Installsrv.pm:86
 msgid "Your install server will be configured with these parameters"
@@ -973,10 +981,6 @@ msgstr "Assistente de Configuração do Kolab"
 msgid "Master kolab server"
 msgstr "Servidor kolab master"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Servidor kolab slave"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1007,21 +1011,23 @@ msgstr "Bemvindo ao Assistente de configuração do servidor Kolab Groupware."
 msgid "Master or slave Kolab server"
 msgstr "Servidor kolab master ou slave"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Você escolhe um servidor Kolab master"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
-msgstr "Escreva o hostname completo do servidor kolab slave ex. maquina.dominio.pt (deixe vazio se não existir)"
+msgstr ""
+"Escreva o hostname completo do servidor kolab slave ex. maquina.dominio.pt "
+"(deixe vazio se não existir)"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Escolheu de configurar um servidor Kolab master."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Servidor kolab slave:"
 
@@ -1035,8 +1041,9 @@ msgid ""
 "FQDN from above. Kolab primary email addresses will be of the type "
 "user@yourdomain"
 msgstr ""
-"Por favor escreva o seu Maildomain - se não conhecer a seu domínio de correio use o nome de domínio acima. Os endereços email principais Kolab vão ser do tipo "
-"utilizador@dominio"
+"Por favor escreva o seu Maildomain - se não conhecer a seu domínio de "
+"correio use o nome de domínio acima. Os endereços email principais Kolab vão "
+"ser do tipo utilizador@dominio"
 
 #: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
 #: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
@@ -1085,17 +1092,27 @@ msgstr "Precisa escrever o nome da Organização e uma unidade de organização"
 msgid ""
 "Kolab can create and manage a certificate authority that can be used to "
 "create SSL certificates for use within the Kolab environment."
-msgstr "O Kolab pode criar e gerir um certificado de autoridade que pode ser utilizado para criar certificados SSL para utilizar no sistema Kolab."
+msgstr ""
+"O Kolab pode criar e gerir um certificado de autoridade que pode ser "
+"utilizado para criar certificados SSL para utilizar no sistema Kolab."
 
 #: ../kolab_wizard/Kolab.pm:150
 msgid ""
 "You can choose to skip this section if you already have certificates for the "
 "Kolab server.CA and certificate"
-msgstr "Pode escolher de saltar esta secção se já tiver certificados para o servidor Kolab. CA e certeficado"
+msgstr ""
+"Pode escolher de saltar esta secção se já tiver certificados para o servidor "
+"Kolab. CA e certeficado"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Escreva a palavra chave para CA, e a palavra chave para a chave RSA."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"O Kolab pode criar e gerir um certificado de autoridade que pode ser "
+"utilizado para criar certificados SSL para utilizar no sistema Kolab."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1111,7 +1128,8 @@ msgstr "Palavra chave RSA:"
 
 #: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
-msgstr "O assistente irá agora configurar o servidor Kolab com estes parâmetros"
+msgstr ""
+"O assistente irá agora configurar o servidor Kolab com estes parâmetros"
 
 #: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
 #: ../postfix_wizard/Postfix.pm:158
@@ -1127,21 +1145,22 @@ msgid "With CA"
 msgstr "Com CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "O servidor Kolab está agora configurado e a correr. Ligue-se como gestor com "
 "a senha que introduziu em https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "A configurar o servidor Kolab no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servidor Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Assistente Ldap"
@@ -1245,7 +1264,8 @@ msgstr "As senhas diferem"
 
 #: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
-msgstr "Administrador é um utilizador poderoso com grande acesso à base de dadosLDAP"
+msgstr ""
+"Administrador é um utilizador poderoso com grande acesso à base de dadosLDAP"
 
 #: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
 #, perl-format
@@ -1450,7 +1470,8 @@ msgid "Polling interval:"
 msgstr "Periodo de verificação:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 "O assistente configurou com sucesso o seu serviço de Notícias Internet no "
 "seu servidor."
@@ -1474,7 +1495,8 @@ msgstr "Assistente de Configuração do Servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
 msgid "This wizard will help you configuring the NFS server for your network."
-msgstr "Este assistente irá ajudá-lo a configurar o servidor NFS para a sua rede."
+msgstr ""
+"Este assistente irá ajudá-lo a configurar o servidor NFS para a sua rede."
 
 #: ../nfs_wizard/NFS.pm:56
 msgid ""
@@ -1490,7 +1512,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directório:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "O caminho que escreveu não existe."
 
@@ -1769,7 +1791,8 @@ msgid "Main Postfix server"
 msgstr "Servidor Postfix principal"
 
 #: ../postfix_wizard/Postfix.pm:172
-msgid "Verify command: this stops some techniques used to harvest email addresses."
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
 msgstr ""
 "Verificar commando: isto pára algumas técnicas usadas nos endereços email "
 "harvest."
@@ -1779,8 +1802,8 @@ msgid ""
 "helo_required: require that a remote SMTP client introduces itself at the "
 "beginning of an SMTP session with the HELO or EHLO command."
 msgstr ""
-"helo_requerido: requer que um cliente remoto SMTP se apresente no "
-"inicio de uma sessão SMTP com um HELO ou EHLO."
+"helo_requerido: requer que um cliente remoto SMTP se apresente no inicio de "
+"uma sessão SMTP com um HELO ou EHLO."
 
 #: ../postfix_wizard/Postfix.pm:179
 msgid "helo required:"
@@ -1810,7 +1833,9 @@ msgstr ""
 msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
-msgstr "A máscara deve ser um nome de domínio válido como p.ex.: \"meu_dominio_a_mascarar.pt com_este_dominio.pt\"!"
+msgstr ""
+"A máscara deve ser um nome de domínio válido como p.ex.: "
+"\"meu_dominio_a_mascarar.pt com_este_dominio.pt\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1897,7 +1922,8 @@ msgstr "Opções das mensagens"
 
 #: ../postfix_wizard/Postfix.pm:229
 msgid "Various options to configure your message queue, delay, size..."
-msgstr "Várias opções para configurar a sua file de mensagens, atraso, tamanho..."
+msgstr ""
+"Várias opções para configurar a sua file de mensagens, atraso, tamanho..."
 
 #: ../postfix_wizard/Postfix.pm:236
 msgid ""
@@ -2023,8 +2049,10 @@ msgid "Proxy port:"
 msgstr "Porta proxy:"
 
 #: ../proxy_wizard/Squid.pm:88
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
-msgstr "Prima Seguinte se quer manter este valor, ou Voltar para mudar a sua escolha."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Prima Seguinte se quer manter este valor, ou Voltar para mudar a sua escolha."
 
 #: ../proxy_wizard/Squid.pm:88
 msgid "You have entered a port that may be useful for this service:"
@@ -2039,7 +2067,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Deve escolher uma porta superior a 1024 e inferior a 65535"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "A cache do disco é o espaço no disco que pode ser usado para pôr em cache no "
 "disco."
@@ -2147,13 +2176,14 @@ msgid "Configuring the Proxy"
 msgstr "A configurar o Proxy"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2308,7 +2338,8 @@ msgstr ""
 "utilizador pode então escolher a imagem que deseja carregar através do PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr ""
 "Por favor escolha a imagem de arranque PXE que deseja remover do seu "
 "servidor PXE."
@@ -2319,7 +2350,8 @@ msgstr "Remover uma imagem de arranque"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
-msgstr "A imagem de arranque PXE, e a respectiva entrada no menu PXE serão apagadas."
+msgstr ""
+"A imagem de arranque PXE, e a respectiva entrada no menu PXE serão apagadas."
 
 #: ../pxe_wizard/Pxe.pm:155
 msgid "Boot image to remove:"
@@ -2339,7 +2371,8 @@ msgstr ""
 "imagem de arranque com parâmetros comuns."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr ""
 "Por favor escolha, da lista em baixo, a imagem de arranque PXE que deseja "
 "modificar"
@@ -2353,7 +2386,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Adicionar opção à imagem de arranque PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
 msgstr ""
 "Directório de Instalação: a localização completa para o directório do "
 "servidor de instalação Mandriva Linux"
@@ -2455,7 +2489,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "É necessária uma imagem all.rdz ou uma network.img. Por favor adicione uma."
+msgstr ""
+"É necessária uma imagem all.rdz ou uma network.img. Por favor adicione uma."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2481,7 +2516,8 @@ msgstr ""
 "espaços."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Para adicionar/remover/modificar imagens de arranque PXE, precisa correr "
 "préviamente 'Configurar servidor PXE'."
@@ -2603,8 +2639,10 @@ msgstr ""
 "através do domínio."
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "As instalações de servidor únicas podem usar as senhas smbpasswd ou tdbsam"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"As instalações de servidor únicas podem usar as senhas smbpasswd ou tdbsam"
 
 #: ../samba_wizard/Samba.pm:141
 msgid "Domain logons:"
@@ -2867,7 +2905,8 @@ msgstr "Mensagem do Servidor."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "A bandeira é a maneira como o servidor vai ser visto na maquinas Windows."
+msgstr ""
+"A bandeira é a maneira como o servidor vai ser visto na maquinas Windows."
 
 #: ../samba_wizard/Samba.pm:307
 msgid "Banner:"
@@ -2956,7 +2995,8 @@ msgstr "Impressoras - configurar as suas impressoras"
 
 #: ../samba_wizard/Sambaprint.pm:65
 msgid "You can enable or disable printers in your Samba server configuration."
-msgstr "Pode activar ou desactivar impressoras na configuração do seu servidor Samba."
+msgstr ""
+"Pode activar ou desactivar impressoras na configuração do seu servidor Samba."
 
 #: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
 msgid ""
@@ -2976,7 +3016,8 @@ msgstr "As impressoras estão disponíveis."
 
 #: ../samba_wizard/Sambaprint.pm:86
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Escolha quais impressoras deseja por à disposição dos utilizadores conhecidos"
+msgstr ""
+"Escolha quais impressoras deseja por à disposição dos utilizadores conhecidos"
 
 #: ../samba_wizard/Sambaprint.pm:92
 msgid "Enable all printers"
@@ -3098,7 +3139,8 @@ msgstr "Criar uma partilha especial, que tipo?"
 
 #: ../samba_wizard/Sambashare.pm:165
 msgid "Now I need to know your understanding in Samba server configuration"
-msgstr "Agora é preciso saber o seu conhecimento na configuração de servidor Samba"
+msgstr ""
+"Agora é preciso saber o seu conhecimento na configuração de servidor Samba"
 
 #: ../samba_wizard/Sambashare.pm:172
 msgid "Delete which share?"
@@ -3147,8 +3189,11 @@ msgid "Directory mask:"
 msgstr "Mascara de Directoria:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "A máscara de criação, o forçamento do modo directório e do modo criar deve ser numérico. ex: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"A máscara de criação, o forçamento do modo directório e do modo criar deve "
+"ser numérico. ex: 0755."
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3214,8 +3259,8 @@ msgid ""
 "Specifies a list of users that have read-only access to a writable share. "
 "ie: anne"
 msgstr ""
-"Especifica uma lista de utilizadores que têm apenas acesso em leitura a "
-"uma partilha com permissão de escrita. ex: josé"
+"Especifica uma lista de utilizadores que têm apenas acesso em leitura a uma "
+"partilha com permissão de escrita. ex: josé"
 
 #: ../samba_wizard/Sambashare.pm:271
 msgid "Specifies a user that have read-write access to a share. ie: fred"
@@ -3335,8 +3380,8 @@ msgstr ""
 "que irá sempre ser definido num directório criado pelo Samba. Isto é feito "
 "com operações OU de bit-a-bit destes bits com os bits do directório a ser "
 "criado.O valor predefinido para este parâmetro é (em octal) 0000 que não irá "
-"adicionar qualquer bit de permissão extra num directório criado. "
-"ex: forçar modo pasta = 0755"
+"adicionar qualquer bit de permissão extra num directório criado. ex: forçar "
+"modo pasta = 0755"
 
 #: ../samba_wizard/Sambashare.pm:307
 msgid "force directory mode"
@@ -3416,7 +3461,8 @@ msgstr ""
 #: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:409
 #: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:458
 msgid "Can't create the directory, please enter a correct path."
-msgstr "Não é possível criar o directório, por favor indique a localização correcta."
+msgstr ""
+"Não é possível criar o directório, por favor indique a localização correcta."
 
 #: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:406
 #: ../samba_wizard/Sambashare.pm:455
@@ -3451,7 +3497,10 @@ msgstr "Adicionar uma partilha pública"
 msgid ""
 "Be careful, you define your public share writable. This wizard will change "
 "permission to nobody.users, so do not use this feature on a home directory !"
-msgstr "Atenção, definiu a sua partilha publica em escritura. Este assistente vai mudar o proprietário em nobody.users, portanto não utilize isto numa pasta pessoal!"
+msgstr ""
+"Atenção, definiu a sua partilha publica em escritura. Este assistente vai "
+"mudar o proprietário em nobody.users, portanto não utilize isto numa pasta "
+"pessoal!"
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
@@ -3849,19 +3898,19 @@ msgstr "A configurar o seu servidor OpenSSH..."
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Assistente de Tempo"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Tente novamente"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Gravar a configuração sem testar"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3869,15 +3918,16 @@ msgstr ""
 "Este assistente vai ajudar-lo a definir a hora do seu servidor sincronizada "
 "com um servidor de tempo exterior."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
-msgstr "Assim o seu servidor vai ser o servidor de tempo local para a sua rede."
+msgstr ""
+"Assim o seu servidor vai ser o servidor de tempo local para a sua rede."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "prima seguinte para começar, ou cancelar para sair deste assistente."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3885,35 +3935,35 @@ msgstr ""
 "(aconselhamos a usar o servidor pool.ntp.org duas vezes uma vez que este "
 "servidor raramente aponta para servidores horários disponíveis)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Escolha um servidor principal e segundario a partir da lista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servidores de Tempo"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Servidor de Tempo Principal:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Servidor de Tempo segundario:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Escolha um fuso horário"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Escolha uma região:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Escolha um país:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3921,35 +3971,35 @@ msgstr ""
 "Se o servidor de tempo não está imediatamente disponível (problema de rede "
 "ou outro), vai esperar cerca de 30 segundos."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Prima seguinte para iniciar o teste dos servidores de tempo."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "A testar a disponibilidade dos servidores de tempo"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zona de tempo:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Os servidores de tempo não estão a responder. A razoes podem ser:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- servidores de tempo inexistentes"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- não fora da rede"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- outras razoes..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3957,11 +4007,11 @@ msgstr ""
 "Pode tentar contactar novamente os servidores de tempo, ou gravar a "
 "configuração sem regular de facto a hora."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "A configuração do servidor de tempo foi gravada"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "O seu servidor pode agora agir como um servidor de tempopara a sua rede "
@@ -3978,7 +4028,8 @@ msgstr "%s não existe."
 
 #: ../web_wizard/Apache.pm:72
 msgid "This wizard will help you configuring the Web server for your network."
-msgstr "Este assistente vai ajudar-lo a configurar o servidor Web para a sua rede."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar o servidor Web para a sua rede."
 
 #: ../web_wizard/Apache.pm:72
 msgid "Web server configuration wizard"
@@ -4004,15 +4055,15 @@ msgstr ""
 "O seu servidor pode agir como um servidor Web para a sua rede interna "
 "(intranet) e para o Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Activa o Servidor Web para o Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Activa o Servidor Web para o Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4022,11 +4073,11 @@ msgstr ""
 "directórios home disponível no seu servidor http por http://www.oseuservidor."
 "com/~utilizador, irá-lhe ser pedido o nome deste directório depois."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Módulos:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4034,7 +4085,7 @@ msgstr ""
 "Permite aos utilizadores obter um directório nos seus directórios home "
 "disponíveis no seu servidor http via http://www.oseuservidor.com/~utilizador."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4043,27 +4094,27 @@ msgstr ""
 "directórios home (sem ~/) para a ter disponível em http://www.oseuservidor."
 "com/~utilizador"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Deve indicar uma pasta de utilizador."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sub-directório http dos utilizadores: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Escreva o caminho da pasta que deseja como raiz dos documentos."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Raiz dos documentos:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "A configurar o Servidor Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4071,27 +4122,40 @@ msgstr ""
 "O assistente recuperou os parametros seguintes precisos para configurar ao "
 "servidor Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Servidor web intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Servidor web internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Directório do utilizador:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "O assistente conseguiu configurar o seu servidor Web Intranet/Internet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servidor Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "A configurar o seu sistema como um servidor Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "O comando ainda está a correr. Deseja matá-lo e sair do assistente?"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Servidor kolab slave"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr ""
+#~ "Escreva a palavra chave para CA, e a palavra chave para a chave RSA."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f2e69e01..28f077f0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-06 12:12-0300\n"
 "Last-Translator: Arthur R. Mello <renato@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -31,8 +31,8 @@ msgstr "assistente de configuração"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Aviso."
 
@@ -44,17 +44,17 @@ msgstr "Erro."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -76,7 +76,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Pressione próximo para começar, ou cancelar para sair deste assistente."
+msgstr ""
+"Pressione próximo para começar, ou cancelar para sair deste assistente."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -88,7 +89,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "O assistente ajudará você a adicionar um novo cliente em seu DNS local."
+msgstr ""
+"O assistente ajudará você a adicionar um novo cliente em seu DNS local."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -102,7 +104,8 @@ msgstr "Identificação do Cliente:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Note que o endereço de IP e o nome do cliente devem ser únicos na rede."
+msgstr ""
+"Note que o endereço de IP e o nome do cliente devem ser únicos na rede."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
@@ -129,42 +132,42 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Erro."
 
@@ -228,16 +231,6 @@ msgstr ""
 "do domínio precisa ser um nome DNS completo (FQDN). Execute o drakconnect "
 "para ajustar isso."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"O comando continua sendo executado. Você deseja terminá-lo e sair do "
-"assistente?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Fechar"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Assistente DHCP"
@@ -252,7 +245,8 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Este assistente ajudará você a configurar o serviço DHCP de seu servidor."
+msgstr ""
+"Este assistente ajudará você a configurar o serviço DHCP de seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
@@ -329,8 +323,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "desabilitado"
 
@@ -338,8 +332,8 @@ msgstr "desabilitado"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "habilitado"
 
@@ -357,13 +351,13 @@ msgstr "O assistente configurou com sucesso os serviços DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Falha"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Reinicie o drakwizard, e tente mudar alguns parâmetros"
 
@@ -506,7 +500,8 @@ msgid "Default domain name to search:"
 msgstr "Nome de domínio padrão para pesquisar:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Este não é um endereço de IP válido para seu encaminhador...\n"
 "pressione próximo para continuar"
@@ -519,7 +514,8 @@ msgstr ""
 
 #: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
-msgstr "Este não é um endereço de IP válido... pressione próximo para continuar"
+msgstr ""
+"Este não é um endereço de IP válido... pressione próximo para continuar"
 
 #: ../dns_wizard/Bind.pm:196
 msgid ""
@@ -551,7 +547,8 @@ msgstr ""
 "Favor execute o assistente do DNS: Servidor DNS mestre."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Parece que você não é um servidor DNS mestre. Então eu não posso adicionar/"
 "remover maquina."
@@ -581,7 +578,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Cliente com esta identificação será removido do seu DNS"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "O servidor DNS está para ser configurado com a seguinte configuração"
 
 #: ../dns_wizard/Bind.pm:245
@@ -677,19 +675,24 @@ msgstr "Servidor de Notícias"
 msgid "NFS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Servidor Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Servidor de FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Seleção de assistente Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Favor selecionar um assistente"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -698,7 +701,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em \"Próximo\" para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Falha na instalação"
 
@@ -712,7 +715,8 @@ msgstr "Assistente de configuração para o servidor de FTP"
 
 #: ../ftp_wizard/Proftpd.pm:78
 msgid "This wizard will help you configuring an FTP server for your network."
-msgstr "Este assistente ajudará você a configurar um servidor FTP para sua rede."
+msgstr ""
+"Este assistente ajudará você a configurar um servidor FTP para sua rede."
 
 #: ../ftp_wizard/Proftpd.pm:84
 msgid "Select the kind of FTP service you want to activate:"
@@ -752,7 +756,8 @@ msgstr "Opções do servidor de FTP Proftpd, passo 1"
 
 #: ../ftp_wizard/Proftpd.pm:98
 msgid "Permit root login: allow root to log on FTP server."
-msgstr "Permitir login do root: permite que o root faça login no servidor de FTP."
+msgstr ""
+"Permitir login do root: permite que o root faça login no servidor de FTP."
 
 #: ../ftp_wizard/Proftpd.pm:104
 msgid "Server name:"
@@ -791,7 +796,8 @@ msgstr "Permitir FXP: permite a transferência de aquivos via outro FTP."
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "Chroot home user: users will only see their home directory."
-msgstr "Diretório de usuário 'chroot': usuários irão apenas ver seu diretório home."
+msgstr ""
+"Diretório de usuário 'chroot': usuários irão apenas ver seu diretório home."
 
 #: ../ftp_wizard/Proftpd.pm:118
 msgid "FTP server options, step 2"
@@ -887,7 +893,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Configurar um serividor de instalação (via NFS e HTTP)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr ""
 "Configure facilmente um diretório para o servidor de instalação, com acesso "
 "NFS e HTTP."
@@ -973,10 +980,6 @@ msgstr "Assistente de Configuração do Kolab"
 msgid "Master kolab server"
 msgstr "Servidor kolab mestre"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Servidor kolab escravo"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1007,21 +1010,23 @@ msgstr "Bem Vindo ao assistente de configuração do Kolab Groupware"
 msgid "Master or slave Kolab server"
 msgstr "Servidor Kolab mestre ou escravo"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Você escolheu um servidor Kolab mestre"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
-msgstr "Entre um hostname totalmente qualificado para o servidor kolab escravo. ex. estamaquina.domínio.tld (deixe vazio caso não exista)."
+msgstr ""
+"Entre um hostname totalmente qualificado para o servidor kolab escravo. ex. "
+"estamaquina.domínio.tld (deixe vazio caso não exista)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Você escolheu configurar um servidor Kolab mestre."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Servidor Kolab escravo:"
 
@@ -1034,7 +1039,10 @@ msgid ""
 "Please enter your Maildomain - if you do not know your mail domain use the "
 "FQDN from above. Kolab primary email addresses will be of the type "
 "user@yourdomain"
-msgstr "Por favor entre seu domínio de e-mail - se você não sabe qual o seu domínio de e-mail use as informações acima. Endereço de e-mail primário Kolab será do tipo usuario@seudominio"
+msgstr ""
+"Por favor entre seu domínio de e-mail - se você não sabe qual o seu domínio "
+"de e-mail use as informações acima. Endereço de e-mail primário Kolab será "
+"do tipo usuario@seudominio"
 
 #: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
 #: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
@@ -1077,23 +1085,34 @@ msgstr "Unidade organizacional:"
 
 #: ../kolab_wizard/Kolab.pm:143
 msgid "You need to enter an Organisation name and an organisational unit"
-msgstr "Você precisa informar um nome de organização e uma unidade organizacional"
+msgstr ""
+"Você precisa informar um nome de organização e uma unidade organizacional"
 
 #: ../kolab_wizard/Kolab.pm:150
 msgid ""
 "Kolab can create and manage a certificate authority that can be used to "
 "create SSL certificates for use within the Kolab environment."
-msgstr "Kolab pode criar e gerenciar uma autoridade de certificado que pode ser usada para criar certificados SSL para uso no ambiente Kolab."
+msgstr ""
+"Kolab pode criar e gerenciar uma autoridade de certificado que pode ser "
+"usada para criar certificados SSL para uso no ambiente Kolab."
 
 #: ../kolab_wizard/Kolab.pm:150
 msgid ""
 "You can choose to skip this section if you already have certificates for the "
 "Kolab server.CA and certificate"
-msgstr "Você pode escolher pular esta sessão se você já tem um certificado para o servidor Kolab."
+msgstr ""
+"Você pode escolher pular esta sessão se você já tem um certificado para o "
+"servidor Kolab."
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Entre a senha para o CA, e a senha para a chave RSA."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab pode criar e gerenciar uma autoridade de certificado que pode ser "
+"usada para criar certificados SSL para uso no ambiente Kolab."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1125,21 +1144,22 @@ msgid "With CA"
 msgstr "Com CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "O servidor kolab foi configurarado e está funcionando. Logue como "
 "'mananger,' com a senha que você setou, em https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Servidor Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Assistente do LDAP"
@@ -1271,7 +1291,8 @@ msgstr "Árvore de diretório LDAP"
 
 #: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
-msgstr "O nomenclatura DNS é utilizado para a definição da árvore de diretório LDAP"
+msgstr ""
+"O nomenclatura DNS é utilizado para a definição da árvore de diretório LDAP"
 
 #: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:230
 #: ../ldap_wizard/Ldap.pm:272
@@ -1449,7 +1470,8 @@ msgid "Polling interval:"
 msgstr "Intervalo de checagem:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 "O assistente configurou o serviço de Notícias da Internet do seu servidor "
 "com sucesso."
@@ -1473,7 +1495,8 @@ msgstr "Assistente de configuração do servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
 msgid "This wizard will help you configuring the NFS server for your network."
-msgstr "O assistente ajudará você a configurar o servidor de NFS para sua rede."
+msgstr ""
+"O assistente ajudará você a configurar o servidor de NFS para sua rede."
 
 #: ../nfs_wizard/NFS.pm:56
 msgid ""
@@ -1489,7 +1512,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Diretório:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "O caminho digitado não existe."
 
@@ -1682,7 +1705,8 @@ msgstr "Assistente de configuração de Correio Eletrônico"
 msgid ""
 "This wizard will help you configure a Postfix mail server or a Postfix mail "
 "relay."
-msgstr "Este assistente ajudará você a configurar um servidor de e-mail Postfix."
+msgstr ""
+"Este assistente ajudará você a configurar um servidor de e-mail Postfix."
 
 #: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
 #: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
@@ -1767,7 +1791,8 @@ msgid "Main Postfix server"
 msgstr "Servidor Postfix principal"
 
 #: ../postfix_wizard/Postfix.pm:172
-msgid "Verify command: this stops some techniques used to harvest email addresses."
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
 msgstr ""
 "Verificar comando: isto para algumas técnicas usadas para coletar endereços "
 "de e-mail."
@@ -1808,7 +1833,9 @@ msgstr ""
 msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
-msgstr "Mascarado deve ser um nome de domínio válido tal como \"dominio_mascarado.com com_este_dominio.com\"!"
+msgstr ""
+"Mascarado deve ser um nome de domínio válido tal como \"dominio_mascarado."
+"com com_este_dominio.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1895,7 +1922,8 @@ msgstr "Opções de menssagens"
 
 #: ../postfix_wizard/Postfix.pm:229
 msgid "Various options to configure your message queue, delay, size..."
-msgstr "Várias opções para configurar sua fila de mensagens: atraso, tamanho ..."
+msgstr ""
+"Várias opções para configurar sua fila de mensagens: atraso, tamanho ..."
 
 #: ../postfix_wizard/Postfix.pm:236
 msgid ""
@@ -2021,7 +2049,8 @@ msgid "Proxy port:"
 msgstr "Porta do Proxy:"
 
 #: ../proxy_wizard/Squid.pm:88
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Pressione Próximo se você quiser manter este valor, ou Voltar para corrigir "
 "sua escolha. "
@@ -2039,7 +2068,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Você precisa escolher um porta maior que 1024 e menor que 65535"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Cache de disco é um uma parte do disco rígido que pode ser usada para fazer "
 "cache."
@@ -2086,7 +2116,8 @@ msgstr ""
 
 #: ../proxy_wizard/Squid.pm:111
 msgid "The proxy can be configured to use different access control levels"
-msgstr "O proxy pode ser configurado para diferentes níveis de controle de acesso."
+msgstr ""
+"O proxy pode ser configurado para diferentes níveis de controle de acesso."
 
 #: ../proxy_wizard/Squid.pm:124
 msgid ""
@@ -2145,13 +2176,14 @@ msgid "Configuring the Proxy"
 msgstr "Configurando o proxy"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "O assistente coletou os seguintes parâmetros necessários para configurar seu "
 "servidor proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2258,7 +2290,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
-msgstr "Caminho da imagem: fornece o caminho completo da imagem de boot de rede"
+msgstr ""
+"Caminho da imagem: fornece o caminho completo da imagem de boot de rede"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2301,8 +2334,10 @@ msgstr ""
 "imagem ele quer para dar boot através do PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
-msgstr "Favor escolher imagem de boot PXE que você quer remover do servidor PXE."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+"Favor escolher imagem de boot PXE que você quer remover do servidor PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Remove a boot image"
@@ -2310,7 +2345,8 @@ msgstr "Remove uma imagem de boot"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
-msgstr "A imagem de boot PXE e a entrada do menu PXE relacionada serão apagadas."
+msgstr ""
+"A imagem de boot PXE e a entrada do menu PXE relacionada serão apagadas."
 
 #: ../pxe_wizard/Pxe.pm:155
 msgid "Boot image to remove:"
@@ -2330,7 +2366,8 @@ msgstr ""
 "com parâmetros comuns."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr "Favor escolher, da lista abaixo, a imagem de boot PXE para modificar"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2342,7 +2379,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Adicionar uma opção a imagem de boot PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
 msgstr ""
 "Diretório de Instalação: o caminho completo para instalação do servidor de "
 "diretório Mandriva Linux"
@@ -2467,10 +2505,12 @@ msgstr "Favor escolher uma imagem para o diretório diferente de %s."
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Favor fornecer um nome PXE correto: uma palavra ou um número sem espaço"
+msgstr ""
+"Favor fornecer um nome PXE correto: uma palavra ou um número sem espaço"
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Para adicionar/remover/modificar imagens de boot PXE, você precisa antes "
 "executar o 'Definir servidor PXE'."
@@ -2507,7 +2547,8 @@ msgstr "Arquivo de 'ajuda' do PXE:"
 
 #: ../pxe_wizard/Pxe.pm:248
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "O assistente vai modificar agora as opções de boot com estes parâmetros:"
+msgstr ""
+"O assistente vai modificar agora as opções de boot com estes parâmetros:"
 
 #: ../pxe_wizard/Pxe.pm:265
 msgid "The wizard will now remove this PXE boot image"
@@ -2590,7 +2631,8 @@ msgstr ""
 "através do domínio."
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 "Instalações de servidores simples pode usar smbpasswd ou tsbsam como "
 "backends para senha"
@@ -2835,7 +2877,8 @@ msgstr "Senhas não conferem."
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "O Samba precisa saber o grupo de trabalho do windows que será servidor."
+msgstr ""
+"O Samba precisa saber o grupo de trabalho do windows que será servidor."
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Workgroup"
@@ -2857,7 +2900,8 @@ msgstr "Logotipo do Servidor."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "O banner é a maneira como este servidor será descrito nas estações Windows."
+msgstr ""
+"O banner é a maneira como este servidor será descrito nas estações Windows."
 
 #: ../samba_wizard/Samba.pm:307
 msgid "Banner:"
@@ -2877,7 +2921,8 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Nível de log: marca o nível do log (armazenamento) (0 <= nível do log <=10)"
+msgstr ""
+"Nível de log: marca o nível do log (armazenamento) (0 <= nível do log <=10)"
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
@@ -3093,7 +3138,8 @@ msgstr "Criar um compartilhamento especial, de qual tipo?"
 
 #: ../samba_wizard/Sambashare.pm:165
 msgid "Now I need to know your understanding in Samba server configuration"
-msgstr "Agora eu preciso saber seu conhecimento na configuração de um servidor Samba"
+msgstr ""
+"Agora eu preciso saber seu conhecimento na configuração de um servidor Samba"
 
 #: ../samba_wizard/Sambashare.pm:172
 msgid "Delete which share?"
@@ -3142,8 +3188,11 @@ msgid "Directory mask:"
 msgstr "Máscara do diretório:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Criar máscara, modo de criação e máscara do diretório devem ser numéricos. ex.: 0755"
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Criar máscara, modo de criação e máscara do diretório devem ser numéricos. "
+"ex.: 0755"
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3448,7 +3497,10 @@ msgstr "Adicionar um compartilhamento público"
 msgid ""
 "Be careful, you define your public share writable. This wizard will change "
 "permission to nobody.users, so do not use this feature on a home directory !"
-msgstr "Cuidado quando definir permissão de escrita em um compartilhamento público. Este assistente irá alterar as perimissões aos ususário desconhecidos, então não utilize está opção em um diretório home !"
+msgstr ""
+"Cuidado quando definir permissão de escrita em um compartilhamento público. "
+"Este assistente irá alterar as perimissões aos ususário desconhecidos, então "
+"não utilize está opção em um diretório home !"
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
@@ -3604,7 +3656,8 @@ msgstr "O assistente adicionou com sucesso seu compartilhamento."
 
 #: ../samba_wizard/Sambashare.pm:664
 msgid "The wizard successfully added your user share."
-msgstr "O assistente adicionou com sucesso seu compartilhamento entre usuários."
+msgstr ""
+"O assistente adicionou com sucesso seu compartilhamento entre usuários."
 
 #: ../samba_wizard/Sambashare.pm:669
 msgid "The wizard successfully added your public share."
@@ -3844,19 +3897,19 @@ msgstr "Configurando seu servidor OpenSSH..."
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Assistente de hora"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Tente novamente"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Salvar configuração sem testar"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3864,15 +3917,16 @@ msgstr ""
 "Esse assistente ajudará você a configurar a hora do seu servidor "
 "sincronizado com um servidor de hora externo."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Dessa forma seu servidor será o servidor de hora local para sua rede"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "pressione próximo para continuar, ou cancelar para sair deste assistente"
+msgstr ""
+"pressione próximo para continuar, ou cancelar para sair deste assistente"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3880,35 +3934,35 @@ msgstr ""
 "(recomendamos você usar pool.ntp.org duplamente como servidor aleatório "
 "apontando para os servidores de tempo disponíveis"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Selecione um servidor primário e um secundário da lista"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servidores de Hora"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Servidor de Hora primário:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Servidor de hora secundário:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Escolha um fuso horário:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Escolha uma região:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Escolha um país:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3916,35 +3970,35 @@ msgstr ""
 "Se o servidor de hora não estiver imediatamente disponível (rede ou outras "
 "razões), haverá um atraso de cerca de 30 segundos."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Pressione próximo para iniciar o teste dos servidores de hora"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testando a disponibilidade dos servidores de hora"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Fuso Horário:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Os servidores de hora não estão respondendo. As causas podem ser:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- servidores de hora inexistentes"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nenhuma rede externa"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- outras razões..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3952,11 +4006,11 @@ msgstr ""
 "- Você pode tentar contatar os servidores de hora novamente, ou salvar sem "
 "ajustar a hora"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configuração do servidor de hora salva"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Seu servidor pode agora funcionar como um servidor de hora para sua rede "
@@ -3999,15 +4053,15 @@ msgstr ""
 "Seu servidor pode agir como um Servidor de Web para a sua rede interna "
 "(intranet) e como um Servidor de Web para a Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Habilita o Servidor Web para a Internet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Habilita o servidor Web para a Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4017,11 +4071,11 @@ msgstr ""
 "principais, disponível no seu servidor HTTP via http://www.seuservidor.com/"
 "~usuário. Você será perguntado pelo nome desse diretório posteriormente."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Módulos"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -4029,7 +4083,7 @@ msgstr ""
 "permite aos usuários ter um diretório em seus diretórios principais, "
 "disponível no seu servidor HTTP via http://www.seuservidor.com/~usuário."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4038,27 +4092,28 @@ msgstr ""
 "diretórios (sem o ~/) para os terem disponíveis via http://seuservidor.com/"
 "~usuário"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Você deve especificar um diretório de usuário."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sub-diretório http do usuário: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
-msgstr "Digite o caminho do diretório que você quer que seja a raiz de documentos:"
+msgstr ""
+"Digite o caminho do diretório que você quer que seja a raiz de documentos:"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Caminho do documento:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configurando o Servidor de Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4066,27 +4121,41 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros necessários para configurar seu "
 "servidor de Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Servidor Web de Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Servidor Web da Internet"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Diretório de usuário:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "O assistente configurou com sucesso seu servidor de Internet/Intranet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Servidor Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando seu sistema como servidor Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "O comando continua sendo executado. Você deseja terminá-lo e sair do "
+#~ "assistente?"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Servidor kolab escravo"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr "Entre a senha para o CA, e a senha para a chave RSA."
diff --git a/po/ro.po b/po/ro.po
index b518b40f..d53e5373 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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."
@@ -23,8 +23,8 @@ msgstr "asistent de configurare"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Avertisment."
 
@@ -36,17 +36,17 @@ msgstr "Eroare."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Felicitări!"
 
@@ -128,42 +128,42 @@ msgid "Warning"
 msgstr "Avertisment"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Eroare"
 
@@ -220,15 +220,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Închide"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Asistent DHCP"
@@ -317,8 +308,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "Dezactivat"
 
@@ -326,8 +317,8 @@ msgstr "Dezactivat"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "Activat"
 
@@ -346,13 +337,13 @@ msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Eşec"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -674,19 +665,25 @@ msgstr "Server de ştiri"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server Samba"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Selecţie asistent Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Vă rog selectaţi un asistent"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -695,7 +692,7 @@ msgstr ""
 "%s nu este instalat\n"
 "Apăsaţi \"Înainte\" pentru a instala sau \"Renunţă\" pentru a ieşi"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
@@ -970,11 +967,6 @@ msgstr "Asistent de configurare Samba"
 msgid "Master kolab server"
 msgstr "Server NFS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server NFS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1000,22 +992,22 @@ msgstr "Asistent de configurare server Web"
 msgid "Master or slave Kolab server"
 msgstr "Server NFS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server NFS"
@@ -1090,7 +1082,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1126,21 +1121,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server Samba"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Asistent Ldap"
@@ -1506,7 +1500,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Director:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Calea introdusă nu există."
 
@@ -2150,7 +2144,7 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea Proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3776,19 +3770,19 @@ msgstr "Configurez serverul FTP"
 msgid "OpenSSH server"
 msgstr "Server web Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Asistent timp"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Încercaţi din nou"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Salvează configuraţia fără testare"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3796,17 +3790,17 @@ msgstr ""
 "Acest asistent vă va ajuta la configurarea orei exacte pt. serverul dvs., "
 "sincronizat cu un server de timp extern."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Astfel acest server va fi serverul de timp local pentru reţeaua dvs."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Apăsaţi Următorul pentru a începe, sau Renunţă pentru a părăsi acest "
 "asistent."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 #, fuzzy
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
@@ -3815,35 +3809,35 @@ msgstr ""
 "(vă recomandăm să folosiţi pool.ntp.org se două ori pentru că acest server "
 "direcţionează aleator la servere de timp disponibile)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Selectaţi un server principal şi unul secundar din listă."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servere de timp"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Adresa serverului de timp principal:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Adresa serverului de timp secundar:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Alegeţi o zonă de timp"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Alegeţi o regiune:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Alegeţi o ţară:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3851,35 +3845,35 @@ msgstr ""
 "Dacă serverul de timp nu este disponibil imediat (reţea sau alt motiv), veţi "
 "aştepta cam 30 de secunde."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Apăsaţi Următorul pentru a porni testul serverelor de timp."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testez disponibilitatea serverelor de timp"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zona de timp:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Serverele de timp nu răspund. Cauzele pot fi:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- servere de timp inexistente"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- fără reţea exterioară"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- alte motive..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3887,11 +3881,11 @@ msgstr ""
 "- Puteţi încerca din nou să contactaţi serverele de timp, sau să salvaţi "
 "configuraţia fără să modificaţi ceasul."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Configurare server de timp salvată"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Serverul dvs. poate lucra acum ca server de timp pentru reţeaua locală."
@@ -3935,15 +3929,15 @@ msgstr ""
 "Serverul dvs. poate acţiona ca un server Web către reţeaua dvs. internă "
 "(intranet) şi ca un server Web pentru Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Activează serverul Web pentru Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Activează serverul Web pentru Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3953,11 +3947,11 @@ msgstr ""
 "directorul lor acasă prin http://www.serverultau.ro/~utilizator, veţi putea "
 "introduce numele acestui director mai târziu."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Module:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3966,7 +3960,7 @@ msgstr ""
 "Permite utilizatorilor să acceseze un director din directorul lor personal \n"
 "accesibil pe serverul http via http://www.serverultau.ro/~utilizator."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3975,29 +3969,29 @@ msgstr ""
 "acasă ( fără ~/) pt. a fi disponibil via http://www.serveruldvs.ro/"
 "~utilizator"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Server Samba"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sub-director utilizator http: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Introduceţi calea spre directorul care vreţi să fie document rădăcină. "
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Rădăcină document:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Configurez serverul Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4005,33 +3999,40 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serverului Web."
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Server Web în Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Server Web în Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Director utilizator:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. Web pentru Intranet/Internet."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Server web Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurez serverul DNS"
 
+#~ msgid "Close"
+#~ msgstr "Închide"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server NFS"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "Director utilizator:"
diff --git a/po/ru.po b/po/ru.po
index 890fb371..ac219015 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-05 16:08+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <doc@lafox.net>\n"
@@ -23,8 +23,8 @@ msgstr "мастер настройки"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Предупреждение."
 
@@ -36,17 +36,17 @@ msgstr "Ошибка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Поздравляем"
 
@@ -94,7 +94,8 @@ msgstr "Идентификация клиента:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
+msgstr ""
+"Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
@@ -121,42 +122,42 @@ msgid "Warning"
 msgstr "Предупреждение"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Ошибка"
 
@@ -220,14 +221,6 @@ msgstr ""
 "должно быть полностью определенным именем домена (FQDN, Fully Qualified "
 "Domain Name). Запустите drakconnect для его изменения."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Команда все еще работает. Хотите убить ее и завершить работу Мастера?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Закрыть"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Мастер DHCP"
@@ -316,8 +309,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "отключен"
 
@@ -325,8 +318,8 @@ msgstr "отключен"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "включен"
 
@@ -344,13 +337,13 @@ msgstr "Мастер успешно настроил службы DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Завершился неудачей"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустите drakwizard, и попробуйте изменить некоторые параметры."
 
@@ -492,14 +485,16 @@ msgid "Default domain name to search:"
 msgstr "Доменное имя для поиска по умолчанию:"
 
 #: ../dns_wizard/Bind.pm:176
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Это недействительный IP-адрес вашего форвардера... Нажмите Далее для "
 "продолжения"
 
 #: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
-msgstr "Это недействительный IP-адрес ведущего DNS... Нажмите Далее для продолжения"
+msgstr ""
+"Это недействительный IP-адрес ведущего DNS... Нажмите Далее для продолжения"
 
 #: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
@@ -535,7 +530,8 @@ msgstr ""
 "запустите мастер DNS: Ведущий сервер DNS."
 
 #: ../dns_wizard/Bind.pm:211
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Похоже, что вы не являетесь ведущим сервером DNS, поэтому невозможно удалить/"
 "добавить хост."
@@ -565,7 +561,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Клиент с этой идентификацией будет удален из вашей DNS"
 
 #: ../dns_wizard/Bind.pm:243
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "Сервер DNS будет настроен со следующей конфигурацией"
 
 #: ../dns_wizard/Bind.pm:245
@@ -594,11 +591,13 @@ msgstr "Перезапустите drakwizard и попробуйте измен
 
 #: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
-msgstr "Ваша система настраивается для работы в качестве ведущего сервера DNS..."
+msgstr ""
+"Ваша система настраивается для работы в качестве ведущего сервера DNS..."
 
 #: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
-msgstr "Ваша система настраивается для работы в качестве подчиненного сервера DNS..."
+msgstr ""
+"Ваша система настраивается для работы в качестве подчиненного сервера DNS..."
 
 #: ../drakwizard.pl:41
 msgid "Apache2 web server"
@@ -661,19 +660,24 @@ msgstr "Сервер новостей"
 msgid "NFS server"
 msgstr "Сервер NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Сервер Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Сервер FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Выбор мастера Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Пожалуйста, выберите мастер"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -682,7 +686,7 @@ msgstr ""
 "%s не установлен\n"
 "Нажмите Далее для установки или Отмена для выхода"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
@@ -873,7 +877,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Настройка сервера установки (через NFS и http)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr "Легко настроит каталог сервера установки с доступом по NFS и HTTP."
 
 #: ../installsrv_wizard/Installsrv.pm:59
@@ -912,11 +917,13 @@ msgstr "использование: /var/install/mdk-release"
 msgid ""
 "Error, the source path must be a directory with full Linux installation "
 "directory."
-msgstr "Ошибка, каталог источника должен быть каталогом с полным дистрибутивом Linux."
+msgstr ""
+"Ошибка, каталог источника должен быть каталогом с полным дистрибутивом Linux."
 
 #: ../installsrv_wizard/Installsrv.pm:82
 msgid "The destination directory is already in use. Please choose another one."
-msgstr "Каталог назначения уже используется, пожалуйста, выберите другой каталог."
+msgstr ""
+"Каталог назначения уже используется, пожалуйста, выберите другой каталог."
 
 #: ../installsrv_wizard/Installsrv.pm:86
 msgid "Your install server will be configured with these parameters"
@@ -954,10 +961,6 @@ msgstr "Мастер настройки Kolab"
 msgid "Master kolab server"
 msgstr "Ведущий сервер kolab"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Подчинённый сервер kolab"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -989,21 +992,23 @@ msgstr "Добро пожаловать в мастер конфигурации
 msgid "Master or slave Kolab server"
 msgstr "Ведущий или подчинённый сервер Kolab"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Вы выбрали ведущий сервер Kolab"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
-msgstr "Введите полное доменное имя хоста подчинённого сервера slave, напр., thishost.domain.tld (оставьте пустым, если таковой отсутствует)."
+msgstr ""
+"Введите полное доменное имя хоста подчинённого сервера slave, напр., "
+"thishost.domain.tld (оставьте пустым, если таковой отсутствует)."
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Вы выбрали настройку ведущего сервера Kolab."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Подчинённый сервер kolab:"
 
@@ -1016,7 +1021,10 @@ msgid ""
 "Please enter your Maildomain - if you do not know your mail domain use the "
 "FQDN from above. Kolab primary email addresses will be of the type "
 "user@yourdomain"
-msgstr "Пожалуйста, введите Maildomain - если у вас нет своего почтового домена, используйте полное доменное имя, как указано выше. Основные электронные адреса Kolab будут иметь вид пользователь@ваш.домен"
+msgstr ""
+"Пожалуйста, введите Maildomain - если у вас нет своего почтового домена, "
+"используйте полное доменное имя, как указано выше. Основные электронные "
+"адреса Kolab будут иметь вид пользователь@ваш.домен"
 
 #: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
 #: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
@@ -1065,17 +1073,27 @@ msgstr "Вы должны ввести название организации �
 msgid ""
 "Kolab can create and manage a certificate authority that can be used to "
 "create SSL certificates for use within the Kolab environment."
-msgstr "Kolab может создать достоверный сертификат, который может быть использован для создания SSL-сертификатов, применяемых в среде Kolab."
+msgstr ""
+"Kolab может создать достоверный сертификат, который может быть использован "
+"для создания SSL-сертификатов, применяемых в среде Kolab."
 
 #: ../kolab_wizard/Kolab.pm:150
 msgid ""
 "You can choose to skip this section if you already have certificates for the "
 "Kolab server.CA and certificate"
-msgstr "Вы можете пропустить этот раздел, если у вас уже есть сертификаты для сервера CA Kolab"
+msgstr ""
+"Вы можете пропустить этот раздел, если у вас уже есть сертификаты для "
+"сервера CA Kolab"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "Введите пароль для CA и пароль для ключа RSA."
+#, fuzzy
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab может создать достоверный сертификат, который может быть использован "
+"для создания SSL-сертификатов, применяемых в среде Kolab."
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1107,21 +1125,22 @@ msgid "With CA"
 msgstr "Вместе с CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Сервер kolab теперь настроен и запущен. Войдите в систему как 'manager' с "
 "введенным ранее паролем по адресу https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Настраивается сервер Kolab для вашей системы..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Сервер Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Мастер LDAP"
@@ -1253,7 +1272,8 @@ msgstr "Дерево каталога LDAP"
 
 #: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
-msgstr "Для определения дерева каталога LDAP используется присваивание имён DNS"
+msgstr ""
+"Для определения дерева каталога LDAP используется присваивание имён DNS"
 
 #: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:230
 #: ../ldap_wizard/Ldap.pm:272
@@ -1338,7 +1358,8 @@ msgstr "Мастер новостей"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Этот мастер поможет вам настроить службу новостей Интернета для вашей сети."
+msgstr ""
+"Этот мастер поможет вам настроить службу новостей Интернета для вашей сети."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1429,7 +1450,8 @@ msgid "Polling interval:"
 msgstr "Интервал опроса:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Мастер успешно настроил службу новостей Интернета вашего сервера."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1467,7 +1489,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Каталог:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Введенный вами путь не существует."
 
@@ -1531,7 +1553,8 @@ msgstr "Сервер NIS c картой autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Установка сервера NIS с картой autofs, файлами auto.home и auto.master."
+msgstr ""
+"Установка сервера NIS с картой autofs, файлами auto.home и auto.master."
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid ""
@@ -1610,7 +1633,8 @@ msgstr "Пожалуйста, настройте это."
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
-msgstr "Мастер успешно настроил вашу машину в качестве сервера NIS с картой autofs."
+msgstr ""
+"Мастер успешно настроил вашу машину в качестве сервера NIS с картой autofs."
 
 #: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "Configuring your system to be a NIS server with Autofs map..."
@@ -1682,7 +1706,8 @@ msgstr "Что вы хотите сделать:"
 
 #: ../postfix_wizard/Postfix.pm:134
 msgid "Now I need to know your understanding in Postfix server configuration"
-msgstr "Теперь мне необходимо знать ваш уровень знаний в настройке сервера Postfix"
+msgstr ""
+"Теперь мне необходимо знать ваш уровень знаний в настройке сервера Postfix"
 
 #: ../postfix_wizard/Postfix.pm:136 ../samba_wizard/Sambashare.pm:167
 msgid "What kind of user are you:"
@@ -1741,7 +1766,8 @@ msgid "Main Postfix server"
 msgstr "Главный сервер Postfix"
 
 #: ../postfix_wizard/Postfix.pm:172
-msgid "Verify command: this stops some techniques used to harvest email addresses."
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
 msgstr "Команда verify: предотвращает некоторые методики сбора адресов e-mail."
 
 #: ../postfix_wizard/Postfix.pm:172
@@ -1780,7 +1806,9 @@ msgstr ""
 msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
-msgstr "Маскировка должна быть действительным доменным именем, например \"domain_to_masquerade.com with_this_domain.com\"!"
+msgstr ""
+"Маскировка должна быть действительным доменным именем, например "
+"\"domain_to_masquerade.com with_this_domain.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1995,7 +2023,8 @@ msgid "Proxy port:"
 msgstr "Порт прокси:"
 
 #: ../proxy_wizard/Squid.pm:88
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Нажмите Далее, если вы хотите оставить это значение, или Назад, чтобы "
 "исправить ваш выбор."
@@ -2013,7 +2042,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Вы должны выбрать номер порта больше 1024 и меньше 65535"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Дисковый кэш представляет собой пространство на диске, которое может быть "
 "использовано для кэширования на диск."
@@ -2122,11 +2152,13 @@ msgid "Configuring the Proxy"
 msgstr "Настраивается прокси"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
-msgstr "Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2275,7 +2307,8 @@ msgstr ""
 "из образов загрузить через PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr ""
 "Пожалуйста, выберите загрузочный образ PXE, который вы хотите удалить с "
 "сервера PXE."
@@ -2306,8 +2339,10 @@ msgstr ""
 "настройки общих параметров загрузочного образа."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Пожалуйста, выберите загрузочный образ PXE для изменения из списка ниже."
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Пожалуйста, выберите загрузочный образ PXE для изменения из списка ниже."
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2318,8 +2353,10 @@ msgid "Add option to the PXE boot image"
 msgstr "Добавить параметры к загрузочному образу PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
-msgstr "Установочный каталог: полный путь к каталогу сервера установки Mandriva Linux"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
+msgstr ""
+"Установочный каталог: полный путь к каталогу сервера установки Mandriva Linux"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
@@ -2359,11 +2396,13 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "Ramsize: adjust the ramsize parameter on boot image."
-msgstr "Размер ОЗУ: настройте параметр размера ОЗУ (ramsize) загрузочного диска."
+msgstr ""
+"Размер ОЗУ: настройте параметр размера ОЗУ (ramsize) загрузочного диска."
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "VGA option: if you encounter any problem with VGA, please adjust. "
-msgstr "Опция VGA: если у вас возникают проблемы с VGA, настройте, пожалуйста. "
+msgstr ""
+"Опция VGA: если у вас возникают проблемы с VGA, настройте, пожалуйста. "
 
 #: ../pxe_wizard/Pxe.pm:182 ../pxe_wizard/Pxe.pm:254
 msgid "Network client interface:"
@@ -2438,10 +2477,12 @@ msgstr "Пожалуйста, выберите образ из каталога,
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Пожалуйста, укажите корректное имя PXE: одно слово или число без пробелов."
+msgstr ""
+"Пожалуйста, укажите корректное имя PXE: одно слово или число без пробелов."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "Для добавления/удаления/изменения загрузочного образа PXE, вам необходимо "
 "запустить сначала 'Настроить сервер PXE'."
@@ -2562,7 +2603,8 @@ msgstr ""
 "домене."
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
 msgstr ""
 "Одиночно установленные серверы могут использовать базы данных с паролями "
 "smbpasswd или tdbsam"
@@ -2757,7 +2799,8 @@ msgstr "Проверка пароля LDAP:"
 msgid ""
 "It specifies where machines should be added to the ldap tree. ie: "
 "ou=Computers"
-msgstr "Определяет, где в дереве ldap будут добавляться машины. Пример: ou=Computers"
+msgstr ""
+"Определяет, где в дереве ldap будут добавляться машины. Пример: ou=Computers"
 
 #: ../samba_wizard/Samba.pm:260
 msgid "LDAP machine suffix:"
@@ -2771,7 +2814,9 @@ msgstr "LDAP-суффикс пользователя:"
 msgid ""
 "This parameter specifies where users are added to the tree. If this "
 "parameter is not specified, the value from ldap suffix will be used."
-msgstr "Этот параметр определяет, где в дереве будут добавляться пользователи. Если этот параметр не указан, значение берётся из суффикса ldap."
+msgstr ""
+"Этот параметр определяет, где в дереве будут добавляться пользователи. Если "
+"этот параметр не указан, значение берётся из суффикса ldap."
 
 #: ../samba_wizard/Samba.pm:262
 msgid "LDAP group suffix:"
@@ -2803,7 +2848,8 @@ msgstr "Пароли не совпадают."
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba необходимо знать рабочую группу Windows, которую она будет обслуживать."
+msgstr ""
+"Samba необходимо знать рабочую группу Windows, которую она будет обслуживать."
 
 #: ../samba_wizard/Samba.pm:285
 msgid "Workgroup"
@@ -2825,7 +2871,8 @@ msgstr "Баннер сервера."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Баннер представляет собой описание сервера для рабочих станций Windows."
+msgstr ""
+"Баннер представляет собой описание сервера для рабочих станций Windows."
 
 #: ../samba_wizard/Samba.pm:307
 msgid "Banner:"
@@ -2851,7 +2898,8 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Максимальный размер журнала: установите предельный размер log-файлов (в КБ)."
+msgstr ""
+"Максимальный размер журнала: установите предельный размер log-файлов (в КБ)."
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Samba Log"
@@ -2913,13 +2961,16 @@ msgstr "Принтеры - настройка ваших принтеров"
 
 #: ../samba_wizard/Sambaprint.pm:65
 msgid "You can enable or disable printers in your Samba server configuration."
-msgstr "Вы можете включить или отключить принтеры в своей конфигурации сервера Samba."
+msgstr ""
+"Вы можете включить или отключить принтеры в своей конфигурации сервера Samba."
 
 #: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
 msgid ""
 "It seems that you haven't setup a Samba server. Please setup a Samba server "
 "with Samba wizard before manage your shares."
-msgstr "Похоже, что вы не настроили сервер Samba. Пожалуйста, настройте его с помощью мастера перед тем как управлять общими ресурсами."
+msgstr ""
+"Похоже, что вы не настроили сервер Samba. Пожалуйста, настройте его с "
+"помощью мастера перед тем как управлять общими ресурсами."
 
 #: ../samba_wizard/Sambaprint.pm:76
 msgid "Enable printers in Samba?"
@@ -3057,7 +3108,8 @@ msgstr "Какого типа создать специальный ресурс
 
 #: ../samba_wizard/Sambashare.pm:165
 msgid "Now I need to know your understanding in Samba server configuration"
-msgstr "Теперь мне необходимо знать ваш уровень знаний в настройке сервера Samba"
+msgstr ""
+"Теперь мне необходимо знать ваш уровень знаний в настройке сервера Samba"
 
 #: ../samba_wizard/Sambashare.pm:172
 msgid "Delete which share?"
@@ -3106,8 +3158,11 @@ msgid "Directory mask:"
 msgstr "Маска каталога:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Маска создания, принудительный режим создания и маска каталога должны быть числами. Пример: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Маска создания, принудительный режим создания и маска каталога должны быть "
+"числами. Пример: 0755."
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3413,7 +3468,10 @@ msgstr "Добавить общедоступный ресурс"
 msgid ""
 "Be careful, you define your public share writable. This wizard will change "
 "permission to nobody.users, so do not use this feature on a home directory !"
-msgstr "Будьте осторожны, вы открыли к своему общедоступному ресурсу доступ на запись. Этот мастер изменит владельца на nobody.users, поэтому не используйте эту функцию для домашнего каталога."
+msgstr ""
+"Будьте осторожны, вы открыли к своему общедоступному ресурсу доступ на "
+"запись. Этот мастер изменит владельца на nobody.users, поэтому не "
+"используйте эту функцию для домашнего каталога."
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
@@ -3473,7 +3531,8 @@ msgstr "Режим создания должен быть числом. Прим
 
 #: ../samba_wizard/Sambashare.pm:526
 msgid "Specific roving profile share, use the user's home directory"
-msgstr "Особый кочующий ресурс с профилем, использует домашний каталог пользователя."
+msgstr ""
+"Особый кочующий ресурс с профилем, использует домашний каталог пользователя."
 
 #: ../samba_wizard/Sambashare.pm:537
 msgid "Guest access:"
@@ -3628,7 +3687,8 @@ msgstr "Номер порта:"
 
 #: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
-msgstr "Определяет номер порта, прослушиваемого sshd. По умолчанию используется 22."
+msgstr ""
+"Определяет номер порта, прослушиваемого sshd. По умолчанию используется 22."
 
 #: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
@@ -3810,19 +3870,19 @@ msgstr "Настраивается сервер SSH..."
 msgid "OpenSSH server"
 msgstr "Сервер OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Мастер времени"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Попробовать еще раз"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Сохранить настройку без проверки"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3830,15 +3890,15 @@ msgstr ""
 "Этот мастер поможет вам настроить синхронизацию времени на вашем сервере с "
 "внешним сервером времени."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "При этом ваш сервер станет локальным сервером времени в вашей сети."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "нажмите Далее, чтобы начать, или Отмена, чтобы выйти из этого мастера"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3846,35 +3906,35 @@ msgstr ""
 "(мы рекомендуем дважды использовать pool.ntp.org, т.к. этот сервер случайным "
 "образом ссылается на доступные серверы времени)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Выберите из списка первичный и вторичный сервер."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Серверы времени"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Первичный сервер времени:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Вторичный сервер времени:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Выберите часовой пояс"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Выберите регион:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Выберите страну:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3882,35 +3942,35 @@ msgstr ""
 "Если сервер времени сейчас недоступен (проблема с сетью или другая причина), "
 "тогда будет сделана пауза в 30 секунд."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Нажмите Далее, чтобы запустить проверку серверов времени."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Проверяется доступность серверов времени"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Часовой пояс:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Серверы времени не отвечают. Возможные причины:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- серверы времени не существуют"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- внешняя сеть отсутствует"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- другие причины..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3918,13 +3978,14 @@ msgstr ""
 "- Вы можете еще раз попробовать связаться с серверами времени или сохранить "
 "конфигурацию без установки времени."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Конфигурация сервера времени сохранена"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
-msgstr "Теперь ваш сервер может работать в вашей локальной сети как сервер времени."
+msgstr ""
+"Теперь ваш сервер может работать в вашей локальной сети как сервер времени."
 
 #: ../web_wizard/Apache.pm:39
 msgid "Web wizard"
@@ -3965,15 +4026,15 @@ msgstr ""
 "Ваш сервер может работать как веб-сервер в вашей внутренней сети (интранет) "
 "и как веб-сервер для Интернета."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Включить веб-сервер для Интранет"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Включить веб-сервер для Интернет"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3984,11 +4045,11 @@ msgstr ""
 "yourserver.com/~user, в дальнейшем от вас потребуется ввести имя этого "
 "каталога."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Модули:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3996,7 +4057,7 @@ msgstr ""
 "Позволяет пользователям получать доступ к своим домашним каталогам, "
 "доступным на вашем http-сервере, по адресу http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4005,29 +4066,29 @@ msgstr ""
 "домашние каталоги (без ~/) и который будет доступен через http://www."
 "yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Вы должны указать каталог пользователя."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "http-подкаталог пользователя: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Введите путь к каталогу, который вы хотите использовать в качестве корневого "
 "для документов."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Корень документов:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Настраивается веб-сервер"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4035,27 +4096,40 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего веб-"
 "сервера:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Веб-сервер Интранета:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Веб-сервер Интернета:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Каталог пользователя:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Мастер успешно настроил ваш Интранет/Интернет веб-сервер."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Сервер Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Ваша система настраивается для работы в качестве сервера Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Команда все еще работает. Хотите убить ее и завершить работу Мастера?"
+
+#~ msgid "Close"
+#~ msgstr "Закрыть"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Подчинённый сервер kolab"
+
+#~ msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+#~ msgstr "Введите пароль для CA и пароль для ключа RSA."
diff --git a/po/sc.po b/po/sc.po
index e9b567f9..457fd6b0 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-03-22 20:10+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -23,8 +23,8 @@ msgstr "wizard de assètiu "
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Atentu."
 
@@ -36,17 +36,17 @@ msgstr "Faddina."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Cumprimentus"
 
@@ -123,42 +123,42 @@ msgid "Warning"
 msgstr "Atentu"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Ses in dhcp, forsis su server no at a funtzionai cun s'assètiu tuu."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Faddina"
 
@@ -220,15 +220,6 @@ msgstr ""
 "bàlidu, no uguali a localdomain o sbuidu. Su hostname bolit FQDN: Fully "
 "Qualified Domain Name. Lança drakconnect po d'arranjai."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Su cumandu est girendi ancora. Du bolis bociri e bessiri de su Wizard?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Serra"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Wizard DHCP"
@@ -317,8 +308,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "disabivau"
 
@@ -326,8 +317,8 @@ msgstr "disabivau"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "abivau"
 
@@ -345,13 +336,13 @@ msgstr "Su wizard at acabau de assetiai is serbìtziuis DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Faddiu"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Torra a lançai drakwizard, e prova a mudai cancu paràmetru."
 
@@ -661,19 +652,24 @@ msgstr "Server de noas"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Server Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Sçoberu wizard de Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Sçobera unu wizard"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -682,7 +678,7 @@ msgstr ""
 "%s no est aposentau\n"
 "Crica \"Sighi\" po d'aposentai o \"Annudda\" po bessiri"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Aposentadura faddia"
 
@@ -940,11 +936,6 @@ msgstr ""
 msgid "Master kolab server"
 msgstr "Server DNS Master"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server DNS Slave"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -969,21 +960,21 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Server DNS Master"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server DNS Slave"
@@ -1057,7 +1048,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1090,19 +1084,19 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Server Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr ""
@@ -1428,7 +1422,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -2021,7 +2015,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3584,111 +3578,111 @@ msgstr "Assètiu su sistema ke server DNS Slave ..."
 msgid "OpenSSH server"
 msgstr "Server NFS"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
@@ -3727,87 +3721,99 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Su cumandu est girendi ancora. Du bolis bociri e bessiri de su Wizard?"
+
+#~ msgid "Close"
+#~ msgstr "Serra"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server DNS Slave"
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/sk.po b/po/sk.po
index e5f3f0b0..8c20c153 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-08 22:28+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
@@ -19,8 +19,8 @@ msgstr "sprievodca nastavením"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Varovanie:"
 
@@ -32,17 +32,17 @@ msgstr "Chyba."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulujem"
 
@@ -118,42 +118,42 @@ msgid "Warning"
 msgstr "Upozornenie"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Chyba"
 
@@ -215,15 +215,6 @@ msgstr ""
 "doménové meno, nie localdomain alebo žiadne. Spustite drakconnect pre jeho "
 "nastavenie."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Príkaz stále beží. Prajete si ho zabiť a ukončiť Sprievodcu?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zatvoriť"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Sprievodca konfiguráciou DHCP"
@@ -311,8 +302,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "zakázané"
 
@@ -320,8 +311,8 @@ msgstr "zakázané"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "povolené"
 
@@ -339,13 +330,13 @@ msgstr "Sprievodca úspešne nakonfiguroval služby DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Zlyhalo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Znovuspustiť drakwizard a skúsiť zmeniť niektoré nastavenia."
 
@@ -662,19 +653,24 @@ msgstr "News správ"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Výber Drakwizard sprievodcov"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Vyberte si sprievodcu"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -683,7 +679,7 @@ msgstr ""
 "%s nie je nainštalovaný\n"
 "Kliknite na \"Ďalej\" pre inštaláciu, alebo \"Zrušiť\" pre ukončenie"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
@@ -969,11 +965,6 @@ msgstr "Sprievodca konfiguráciou kolab"
 msgid "Master kolab server"
 msgstr "Master DNS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Slave DNS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1005,22 +996,22 @@ msgstr "Vitajte v Sprievodcovi nastavením Kolab Groupware servera."
 msgid "Master or slave Kolab server"
 msgstr "Master DNS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Už ste nastavili váš LDAP server"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Slave DNS server"
@@ -1096,7 +1087,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1131,21 +1125,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Server Kolab je teraz nakonfigurovaný a beží. Prihláste sa do  ako správa s "
 "heslom, ktoré ste zadali na adrese https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurácia Kolab servera na vašom systéme..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Sprievodca konfiguráciou samby"
@@ -1491,7 +1486,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Adresár:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Cesta, ktorú ste zadali neexistuje."
 
@@ -2151,7 +2146,7 @@ msgstr ""
 "vašej proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3808,19 +3803,19 @@ msgstr "Konfigurovať váš Samba server..."
 msgid "OpenSSH server"
 msgstr "Apache server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Sprievodca nastavením času"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Skúsiť znovu"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Uložiť konfiguráciu bez otestovania"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3828,15 +3823,15 @@ msgstr ""
 "Tento sprievodca vám pomôže nastaviť čas na vašom serveri, ktorý bude "
 "zosynchronizovaný s externým časovým serverom."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Takto môže byť váš server časovým serverom pre vašu sieť."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "stlačte Ďalej pre začatie, alebo Zrušiť pre ukončenie tohto sprievodcu"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3844,35 +3839,35 @@ msgstr ""
 "(je odporučné použiť server pool.ntp.org dva krát, pretože táto adresa "
 "vyvolá náhodné presmerovanie na niektorý dostupný časový server)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Vyberte si primárny a sekundárny server zo zoznamu:"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Časové servre"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primárny časový server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundárny časový server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Zvoľte si časovú zónu"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Zvoľte si región:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Zvoľte si mesto:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3880,35 +3875,35 @@ msgstr ""
 "Ak nie je časový server okamžite dostupný (sieťové, alebo iné dôvody), "
 "môžete počkať zhruba 30 sekúnd."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Stlačte Ďalej pre spustenie testu časových serverov"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Otestovanie dostupnosti časového servera"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Časová zóna:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Časový server neodpovedá. Dôvody môžu byť:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- neexistujúci časový server"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- žiadna vonkajšia sieť"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- iné dôvody..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3916,11 +3911,11 @@ msgstr ""
 "- Môžete znovu vyskúšať spojenie s časovým serverom alebo uložiť "
 "konfiguráciu bez aktuálneho nastaveného času."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfigurácia času je uložená"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Váš server môže odteraz fungovať ako časový server vo vašej lokálnej sieti."
@@ -3962,15 +3957,15 @@ msgstr ""
 "Váš server môže plniť funkciu Web servera pre vašu internú sieť (intranet) "
 "alebo byť Web serverom pre Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Povoliť web server pre Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Povoliť web server pre Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3980,11 +3975,11 @@ msgstr ""
 "adresároch, ktorý bude dostupný pomocou http servera ako http://www.server."
 "sk/~používateľ, meno tohto adresára zadáte neskôr."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduly:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3993,7 +3988,7 @@ msgstr ""
 "Povoliť používať používateľom adresár v ich domovských adresároch\n"
 "ktorý je viditeľný pomocou http server ako http://www.server.sk/~pouzivatel."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4001,29 +3996,29 @@ msgstr ""
 "Napíšte meno adresára, kde si používatelia môžu uložiť svoje dokumenty (bez "
 "~/) a budú dostupné cez http://www.server.sk/~používateľ"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Musíte najprv nastaviť LDAPserver"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "používateľský http podadresár: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Zadajte cestu k adresáru kde si želáte mať hlavný adresár s dokumentami."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Koreňový priečinok dokumentov:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigurácia web servera"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4031,30 +4026,41 @@ msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre nakonfigurovanie "
 "vášho web servera."
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet web server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internetový web server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Použivateľov priečinok:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Internet/Intranet Web server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavovanie vášho systému ako Apache server ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Príkaz stále beží. Prajete si ho zabiť a ukončiť Sprievodcu?"
+
+#~ msgid "Close"
+#~ msgstr "Zatvoriť"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Slave DNS server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "E-mailová doména:"
 
diff --git a/po/sl.po b/po/sl.po
index dd2f6ec2..02a8b40e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-27 10:38+0100\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@sdm-si.org>\n"
 "Language-Team:  <sl@li.org>\n"
@@ -28,8 +28,8 @@ msgstr "nastavitveni čarovnik"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Opozorilo."
 
@@ -41,17 +41,17 @@ msgstr "Napaka."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -126,42 +126,42 @@ msgid "Warning"
 msgstr "Opozorilo"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Ste v  strežnik dhcp morda ne bo deloval z vašimi nastavitvami."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Napaka"
 
@@ -223,15 +223,6 @@ msgstr ""
 "domene, ki ni enaka krajevni domeni. Ime gostitelja mora biti FQDN: Fully "
 "Qualified Domain Name. Zaženite drakconnect, da jo nastavite."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Ukaz še vedno teče. Ali ga želite ubiti in končati Čarovnika?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zapri"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Čarovnik za strežnik DHCP"
@@ -320,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "onemogočeno"
 
@@ -329,8 +320,8 @@ msgstr "onemogočeno"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "omogočeno"
 
@@ -348,13 +339,13 @@ msgstr "Čarovnik je uspešno nastavil servise DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Spodletelo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Ponovno zaženite drakwizard in poizkušajte spremeniti nekaj parametrov."
@@ -676,19 +667,24 @@ msgstr "Novičarski strežnik"
 msgid "NFS server"
 msgstr "Strežnik NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Strežnik Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Strežnik FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard izbira čarovnika"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Prosim, izberite čarovnika"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -697,7 +693,7 @@ msgstr ""
 "%s ni nameščen\n"
 "Kliknite \"Naprej\" za namestitev ali \"Prekliči\" za izhod"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Namestitev ni uspela"
 
@@ -988,11 +984,6 @@ msgstr "Kolab nastavitveni čarovnik"
 msgid "Master kolab server"
 msgstr "Glavni strežnik DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Podrejeni strežnik DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1024,22 +1015,22 @@ msgstr "Dobrodošli v Kolab namestitveni čarovnik strežnika za skupinsko delo.
 msgid "Master or slave Kolab server"
 msgstr "Glavni strežnik DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Vaš strežnik Ldap ste že nastavili"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Podrejeni strežnik DNS"
@@ -1115,7 +1106,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1149,21 +1143,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Strežnik Kolab je zdaj nastavljen in teče. Prijavite se kot 'upravitelj', z "
 "geslom, ki ste ga vnesli na https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavljanje strežnika Kolab na vašem sistemu ..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Strežnik Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Čarovnik Ldap"
@@ -1513,7 +1508,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Imenik:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Vpisana pot ne obstaja."
 
@@ -2171,7 +2166,7 @@ msgstr ""
 "strežnika:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3826,19 +3821,19 @@ msgstr "Nastavljanje strežnika Samba ..."
 msgid "OpenSSH server"
 msgstr "Strežnik Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Čarovnik za čas"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Poskusite znova"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Shrani nastavitev brez testiranja"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3846,15 +3841,15 @@ msgstr ""
 "Ta čarovnik vam bo pomagal nastaviti čas vašega strežnika, usklajenega z "
 "zunanjim časovnim strežnikom."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Vaš strežnik bo krajevni časovni strežnik za vaše omrežje."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "Kliknite Naprej za nadaljevanje, ali Prekliči za izhod"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3862,35 +3857,35 @@ msgstr ""
 "(priporočena je dvakratna uporaba strežnika pool.ntp.org, saj ta strežnik "
 "naključno kaže na dostopne časovne strežnike)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Označite primarni in sekundarni strežnik iz seznama."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Časovni strežniki"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primarni časovni strežnik:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundarni časovni strežnik:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Izberite časovni pas"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Izberite območje:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Izberite mesto:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3898,35 +3893,35 @@ msgstr ""
 "Če časovni strežnik ni takoj na voljo (omrežje ali drug vzrok), bo približno "
 "30 sekundna zakasnitev."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Kliknite Naprej za test časovnega strežnika."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testiranje dostopnosti časovnih strežnikov"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Časovni pas:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Časovni strežniki se ne odzivajo.Vzroki so lahko:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- neobstoječi časovni strežniki"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- brez zunanjega omrežja"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "-drugi razlogi ..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3934,11 +3929,11 @@ msgstr ""
 "- Lahko se poskusite znova povezati s časovnimi strežniki, ali pa shranite "
 "nastavitve brez nastavljanja časa."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Nastavitev časovnega strežnika shranjena"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Vaš strežnik ima lahko zdaj vlogo časovnega strežnika vašega krajevnega "
@@ -3983,15 +3978,15 @@ msgstr ""
 "Vaš strežnik lahko deluje kot spletni strežnik v smeri vašega notranjega "
 "omrežja (intranet) in kot spletni strežnik za internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Omogoči spletni strežnik za intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Omogoči spletni strežnik za internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4001,11 +3996,11 @@ msgstr ""
 "ki je na voljo na vašem strežniku HTTP preko http://www.vašstrežnik.com/"
 "~uporabnik. Po imenu imenika boste vprašani pozneje."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduli:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4015,7 +4010,7 @@ msgstr ""
 "ki je na voljo na vašem strežniku HTTP preko http://www.vašstrežnik.com/"
 "~uporabnik."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4023,29 +4018,29 @@ msgstr ""
 "Vpišite ime imenika (brez ~/), ki bodo uporabniki ustvarili v njihovem "
 "domačem imeniku, ki bo na voljo preko http://www.vašstrežnik.com/~uporabnik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Najprej morate postaviti strežnik Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "uporabniški http pod-imenik: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Vpišite pot imenika, za katerega želite da bo korenski imenik dokumentov."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Korenski imenik dokumentov:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Nastavljanje spletnega strežnika"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4053,30 +4048,41 @@ msgstr ""
 "Čarovnik je zbral naslednje parametre, potrebne za nastavitev vašega "
 "spletnega strežnika"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Spletni strežnik za intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Spletni strežnik za internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Uporabnikov imenik:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarovnik je uspešno nastavil intranetni/internetni spletni strežnik"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Strežnik Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavljanje vašega sistema kot strežnik Apache ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Ukaz še vedno teče. Ali ga želite ubiti in končati Čarovnika?"
+
+#~ msgid "Close"
+#~ msgstr "Zapri"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Podrejeni strežnik DNS"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Poštna domena:"
 
diff --git a/po/sq.po b/po/sq.po
index 646dc749..bd1205f2 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -23,8 +23,8 @@ msgstr "Asistenti Konfigurues"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Kujdes"
@@ -37,17 +37,17 @@ msgstr "Gabim."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Urime"
 
@@ -130,7 +130,7 @@ msgid "Warning"
 msgstr "Kujdes"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,37 +138,37 @@ msgstr ""
 "funksionoj, me këtë konfigurim."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Gabim"
 
@@ -225,15 +225,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Mbylle"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Aistenti DHCP"
@@ -327,8 +318,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "jo-aktiv"
 
@@ -336,8 +327,8 @@ msgstr "jo-aktiv"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aktiv"
 
@@ -357,13 +348,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Dështoi"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -692,19 +683,25 @@ msgstr "Server i Lajmeve"
 msgid "NFS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server i Bazës së të Dhënave"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Zgjedhja e asistentit Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Ju lutemi zgjedheni një asistent"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -713,7 +710,7 @@ msgstr ""
 "%s nuk është instaluar\n"
 "Kliko mbi \"Tjetri\" për ta instaluar apo mbi \"Anulo\" për ta braktisur"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalimi dështio"
 
@@ -989,11 +986,6 @@ msgstr "Asistent Konfigurues Samba"
 msgid "Master kolab server"
 msgstr "Server NFS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Server NFS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1019,22 +1011,22 @@ msgstr "Asistenti Konfigurues për Server Web"
 msgid "Master or slave Kolab server"
 msgstr "Server NFS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Server NFS"
@@ -1110,7 +1102,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1147,21 +1142,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server i Bazës së të Dhënave"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Asistenti Ldap"
@@ -1527,7 +1521,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Repertori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Shtegun të cilin e keni futur nuk ekziston."
 
@@ -2175,7 +2169,7 @@ msgstr ""
 "proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3792,19 +3786,19 @@ msgstr "Konfigurimi i Serverit FTP"
 msgid "OpenSSH server"
 msgstr "Server Web Intranet:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Asistent i kohës"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Provo edhe një herë"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Regjistroje konfigurumin pa test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3812,54 +3806,54 @@ msgstr ""
 "Ky asistent do të ju ndihmojë në sikronizimin e datës dhe orës të serverin "
 "tuaj, me kohën e një serveri të jashtëm."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Serveri i juaj do të jetë server i kohës për rrjetin tuaj."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "klikoni mbi Tjetri për të vazhduar, apo mbi Anulo për ta braktisur këtë "
 "asistent"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Zgjedheni njër server primar dhe sekondar nga lista."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Servera të Kohës"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Server i Kohës Primar:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Server i Kohës Sekondare:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Zgjedheni kohën orara:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Zgjedheni kohën orara:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Zgjedheni kohën orara:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3867,35 +3861,35 @@ msgstr ""
 "Nëse serveri i kohës nuk është i lirë (probleme rrjeti apo arësye tjera), ju "
 "duhet të pritni diku rreth 30 sekonda."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Shtypni mbi Tjetri për ta nisur testin e serverit të kohës."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testim i disponibilitetit të serverit të kohës"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Koha orare:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Serveret e kohës nuk përgjigjen. Arësyet mund të jenë për shkaqe të:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- asnjë server i kohës"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- asnjë rrjet i jashtëm"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- arësyet tjera..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3904,11 +3898,11 @@ msgstr ""
 "Ju mund ta testoni edhe një herë serverin e kohës apo ta regjistroni "
 "konfigurimin e p'azhurnuar të orës aktuale."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfigurimi i Serverit të kohës është regjistruar"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Serveri i juaj mund të regoj sikur një server i kohës për rrjetin tuaj lokal."
@@ -3954,15 +3948,15 @@ msgstr ""
 "Serveri i juaj mund të konfigurohet sikur server Web për rrjetin tuaj lokal "
 "(intranet), apo sikur server Web për rrjetin Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Aktivizoje Serverin Web për Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Aktivizoje Serverin Web për Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3973,11 +3967,11 @@ msgstr ""
 "Web me adresën: http://www.serveri-juaj.com/~përdorues, ju do të pyeteni për "
 "emrin e repertorit mbasë këtij operacioni."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modulet:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3988,7 +3982,7 @@ msgstr ""
 "Web me adresën: http://www.serveri-juaj.com/~përdorues, ju do të pyeteni për "
 "emrin e repertorit mbasë këtij operacioni."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3997,30 +3991,30 @@ msgstr ""
 "tyre personel (pa shenja ~/) në mënyrë që të jetë në disponibilitet via Web "
 "nëpërmjet adresës: http://www.serveri-juaj.com/~përdorues"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Server i Bazës së të Dhënave"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "përdorues http për ndër-repertor:~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Shtypni shtegun lokal të repertorit i cili do ti përshtatet dokumenteve "
 "rrënjëzore (root), që furnizohen nga Serveri juaj Web."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumenti root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigurimi i Serverit Web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4028,33 +4022,40 @@ msgstr ""
 "Asistenti i ka përmbledhur parametrat vijues që ju nevojiten në konfigurmin "
 "Serverit tuaj Web"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Server Web Intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Server Web Intenet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Repertori i përdoruesit:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Asistenti e ka konfiguruar me sukses Serverin tuaj Web për Intranet/Internet"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Server Web Intranet:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
+#~ msgid "Close"
+#~ msgstr "Mbylle"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Server NFS"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "Repertori i përdoruesit:"
diff --git a/po/sr.po b/po/sr.po
index 36112518..fca55849 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -22,8 +22,8 @@ msgstr "Чаробњак за подешавање"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Упозорење"
@@ -36,17 +36,17 @@ msgstr "Грешка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Честитке"
 
@@ -125,43 +125,43 @@ msgid "Warning"
 msgstr "Упозорење"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Грешка"
 
@@ -218,15 +218,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Затвори"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP чаробњак"
@@ -314,8 +305,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "искључен"
 
@@ -323,8 +314,8 @@ msgstr "искључен"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "укључен"
 
@@ -343,13 +334,13 @@ msgstr "Чаробњак је успешно подесио DHCP сервисе
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Неуспело"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -673,26 +664,32 @@ msgstr "News сервер"
 msgid "NFS server"
 msgstr "NFS сервер"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Сервер бази података"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-ов избор чаробњака"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Молимо Вас да изаберете чаробњака"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Инсталација није успела"
 
@@ -964,11 +961,6 @@ msgstr "Чаробњак за подешавање Samba-е"
 msgid "Master kolab server"
 msgstr "NFS сервер"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS сервер"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -994,22 +986,22 @@ msgstr "Чаробњак за подешавање Web сервера"
 msgid "Master or slave Kolab server"
 msgstr "NFS сервер"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS сервер"
@@ -1085,7 +1077,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1121,21 +1116,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Сервер бази података"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap чаробњак"
@@ -1496,7 +1490,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директоријум:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "ДИректоријум који сте унели не постоји."
 
@@ -2133,7 +2127,7 @@ msgstr ""
 "подесио:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3753,19 +3747,19 @@ msgstr "Подешавање FTP сервера"
 msgid "OpenSSH server"
 msgstr "Интранет Web сервер:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Временски чаробњак"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Покушај поново"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Сачувај подешавања без тестирања"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3773,53 +3767,53 @@ msgstr ""
 "Овај чаробњак ће Вам помоћи да синхронизујете време Ваших сервера са "
 "спољашњим временским сервером."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Ваш сервер ће бити локални временски сервер на Вашој мрежи."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "притисните даље да би сте почели, или одустани да би сте напустили чаробњака"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Изаберите примарни и секундарни сервер из листе."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Временски сервери"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Примарни временски сервер:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Секундарни временски сервер:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Изаберите временску зону:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Изаберите временску зону:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Изаберите временску зону:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3827,35 +3821,35 @@ msgstr ""
 "Ако временски сервер није одмах доступан (због мреже или других разлога), "
 "наступиће пауза од 30 секунди."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Притисните дугме даље да би сте започели тестирање временског сервера."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Тестирам доступност временског сервера"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Временска зона:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Временски сервери не одговарају. Могући узроци су:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- не постојећи временски сервери"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- нема спољашње мреже"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- други разлози..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3864,11 +3858,11 @@ msgstr ""
 "Можете поново да покушате да се повежете са временским сервером, или да "
 "сачувате подешавања а да при том не подесите време."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Сачувао сам подешавања временског сервера"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Ваш сервер може сада да се понаша као временски сервер на локалној мрежи."
@@ -3911,15 +3905,15 @@ msgstr ""
 "Ваш сервер може да се понаша као Web сервер за Вашу интерну мрежу (интранет) "
 "као и Web сервер за интернет."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Web сервер за интранет"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Web сервер за интернет"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3929,11 +3923,11 @@ msgstr ""
 "корисничким директоријумима буде доступан на http://www.vas-server/"
 "~korisnik, а за име директоријума ћете бити упитани касније."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Модули:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3943,7 +3937,7 @@ msgstr ""
 "корисничким директоријумима буде доступан на http://www.vas-server/"
 "~korisnik, а за име директоријума ћете бити упитани касније."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3952,28 +3946,28 @@ msgstr ""
 "корисничким директоријума (без ~/) да би га добили доступним на http://www."
 "vas-server.com/~korisnik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Сервер бази података"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "корисников http под-директоријум: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Унесите путању до директоријума коју желите да буде корен документа."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Корен документа:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Подешавање Web сервера"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3981,32 +3975,39 @@ msgstr ""
 "Чаробњак је сакупио следеће параметре коју су потребни да би се Ваш Web "
 "сервер подесио"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Интранет Web сервер:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Интернет web сервер:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "КОриснички директоријум:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Чаробњак је успешно подесио ваш интранет/интернет Web сервер"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Интранет Web сервер:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Подешавање DNS сервера"
 
+#~ msgid "Close"
+#~ msgstr "Затвори"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS сервер"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "КОриснички директоријум:"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 04ca283f..d6f5d9e0 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -22,8 +22,8 @@ msgstr "Čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "Upozorenje"
@@ -36,17 +36,17 @@ msgstr "Greška."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -126,43 +126,43 @@ msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Vi 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Greška"
 
@@ -219,15 +219,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Zatvori"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak"
@@ -316,8 +307,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "isključen"
 
@@ -325,8 +316,8 @@ msgstr "isključen"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "uključen"
 
@@ -345,13 +336,13 @@ msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Neuspelo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -675,26 +666,32 @@ msgstr "News server"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Server bazi podataka"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard-ov izbor čarobnjaka"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Molimo Vas da izaberete čarobnjaka"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Instalacija nije uspela"
 
@@ -966,11 +963,6 @@ msgstr "Čarobnjak za podešavanje Samba-e"
 msgid "Master kolab server"
 msgstr "NFS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -996,22 +988,22 @@ msgstr "Čarobnjak za podešavanje Web servera"
 msgid "Master or slave Kolab server"
 msgstr "NFS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS server"
@@ -1087,7 +1079,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1123,21 +1118,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Server bazi podataka"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap čarobnjak"
@@ -1498,7 +1492,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorijum:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "DIrektorijum koji ste uneli ne postoji."
 
@@ -2136,7 +2130,7 @@ msgstr ""
 "podesio:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3757,19 +3751,19 @@ msgstr "Podešavanje FTP servera"
 msgid "OpenSSH server"
 msgstr "Intranet Web server:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Vremenski čarobnjak"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Pokušaj ponovo"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Sačuvaj podešavanja bez testiranja"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3777,54 +3771,54 @@ msgstr ""
 "Ovaj čarobnjak će Vam pomoći da sinhronizujete vreme Vaših servera sa "
 "spoljašnjim vremenskim serverom."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Vaš server će biti lokalni vremenski server na Vašoj mreži."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "pritisnite dalje da bi ste počeli, ili odustani da bi ste napustili "
 "čarobnjaka"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Izaberite primarni i sekundarni server iz liste."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Vremenski serveri"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primarni vremenski server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundarni vremenski server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Izaberite vremensku zonu:"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "Izaberite vremensku zonu:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "Izaberite vremensku zonu:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3832,36 +3826,36 @@ msgstr ""
 "Ako vremenski server nije odmah dostupan (zbog mreže ili drugih razloga), "
 "nastupiće pauza od 30 sekundi."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 "Pritisnite dugme dalje da bi ste započeli testiranje vremenskog servera."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testiram dostupnost vremenskog servera"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Vremenska zona:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Vremenski serveri ne odgovaraju. Mogući uzroci su:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- ne postojeći vremenski serveri"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nema spoljašnje mreže"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- drugi razlozi..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3870,11 +3864,11 @@ msgstr ""
 "Možete ponovo da pokušate da se povežete sa vremenskim serverom, ili da "
 "sačuvate podešavanja a da pri tom ne podesite vreme."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Sačuvao sam podešavanja vremenskog servera"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Vaš server može sada da se ponaša kao vremenski server na lokalnoj mreži."
@@ -3917,15 +3911,15 @@ msgstr ""
 "Vaš server može da se ponaša kao Web server za Vašu internu mrežu (intranet) "
 "kao i Web server za internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Web server za intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Web server za internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3935,11 +3929,11 @@ msgstr ""
 "korisničkim direktorijumima bude dostupan na http://www.vas-server/"
 "~korisnik, a za ime direktorijuma ćete biti upitani kasnije."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduli:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3949,7 +3943,7 @@ msgstr ""
 "korisničkim direktorijumima bude dostupan na http://www.vas-server/"
 "~korisnik, a za ime direktorijuma ćete biti upitani kasnije."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3958,28 +3952,28 @@ msgstr ""
 "korisničkim direktorijuma (bez ~/) da bi ga dobili dostupnim na http://www."
 "vas-server.com/~korisnik"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Server bazi podataka"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "korisnikov http pod-direktorijum: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Unesite putanju do direktorijuma koju želite da bude koren dokumenta."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Koren dokumenta:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Podešavanje Web servera"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -3987,32 +3981,39 @@ msgstr ""
 "Čarobnjak je sakupio sledeće parametre koju su potrebni da bi se Vaš Web "
 "server podesio"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet Web server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet web server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "Intranet Web server:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS server"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "KOrisnički direktorijum:"
diff --git a/po/sv.po b/po/sv.po
index 6e45f1b3..3a2ae84e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-17 17:11+0100\n"
 "Last-Translator: Lars Westergren <lars.westergren@home.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -29,8 +29,8 @@ msgstr "konfigurationsguide"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Varning."
 
@@ -42,17 +42,17 @@ msgstr "Fel."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Gratulerar"
 
@@ -129,42 +129,42 @@ msgid "Warning"
 msgstr "Varning"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Fel"
 
@@ -227,15 +227,6 @@ msgstr ""
 "domännamn, ej localdomain eller none. Värdnamnet måste vara ett FQDN: Fully "
 "Qualified Domain Name. Kör drakconnect för att justera det."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Kommandot körs fortfarande. Vill du stoppa det och avsluta Guiden?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Stäng"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Guide för DHCP"
@@ -324,8 +315,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "inaktiverad"
 
@@ -333,8 +324,8 @@ msgstr "inaktiverad"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "aktiverad"
 
@@ -352,13 +343,13 @@ msgstr "Guiden lyckades med att konfigurera DHCP tjänsterna."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Misslyckades"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Kör om drakwizard, och försök ändra några parametrar."
 
@@ -677,19 +668,24 @@ msgstr "Diskussionsgruppserver"
 msgid "NFS server"
 msgstr "NFS-server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Val av guide"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Välj en guide"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -698,7 +694,7 @@ msgstr ""
 "%s är inte installerad.\n"
 "Klicka på \"Nästa\" för att installera eller \"Avbryt\" för att avsluta."
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Installation misslyckades"
 
@@ -985,11 +981,6 @@ msgstr "Konfigurationsguide för Kolab"
 msgid "Master kolab server"
 msgstr "DNS-huvudserver"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "DNS-slavserver"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1021,22 +1012,22 @@ msgstr "Välkommen till konfigurationsguiden för Kolab grupprogramvaruserver."
 msgid "Master or slave Kolab server"
 msgstr "DNS-huvudserver"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Du har redan konfigurerat din Ldap Server"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "DNS-slavserver"
@@ -1112,7 +1103,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1146,21 +1140,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab servern är nu konfigurerad och igång. Logga in som administratör med "
 "det lösenord du angav på https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerar Kolab servern på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Guide för Ldap"
@@ -1510,7 +1505,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Sökvägen du angav finns inte."
 
@@ -2166,7 +2161,7 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera proxyn:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3826,19 +3821,19 @@ msgstr "Konfigurerar din Samba server..."
 msgid "OpenSSH server"
 msgstr "Apache server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Tidsguide"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Försök igen"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Spara konfiguration utan test"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3846,15 +3841,15 @@ msgstr ""
 "Den här guiden hjälper dig att ställa in tiden på din server så att den "
 "synkroniseras med en extern tidsserver."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Därför kommer din server att vara lokal tidsserver för ditt nätverk."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "klicka på Nästa för att börja eller Avbryt för att avsluta guiden"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3862,35 +3857,35 @@ msgstr ""
 "(vi rekommenderar användning av servern pool.ntp.org två gånger för att "
 "denna server slumpvis pekar på tillgängliga tidsservrar)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Välj en primär och en sekundär server från listan."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Tidsservrar"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primär tidsserver:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sekundär tidsserver:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Välj en tidszon"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Välj en region:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Välj ett land:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3898,35 +3893,35 @@ msgstr ""
 "Om tidsservern inte är omedelbart tillgänglig (nätverk eller annan orsak), "
 "kommer du att få vänta ca 30 sekunder."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Klicka på Nästa för att starta testet av tidsservrarna."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Testar tidsservrarnas tillgänglighet"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Tidszon:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Tidsservrarna svarar inte. Orsakerna kan vara:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- icke existerande tidsservrar"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- inget nätverk på utsidan"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- andra orsaker..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3934,11 +3929,11 @@ msgstr ""
 "- Du kan försöka att kontakta tidsservrarna igen eller spara konfigurationen "
 "utan att ställa in tiden."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Konfigurationsguide för tidsserver"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Servern kan nu agera som en tidsserver för ditt lokala nätverk."
 
@@ -3980,15 +3975,15 @@ msgstr ""
 "Servern kan uppträda som en webbserver mot ditt interna nätverk (intranät) "
 "och som en webbserver för Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Aktivera webbservern för Intranätet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Aktivera webbservern för Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3998,11 +3993,11 @@ msgstr ""
 "på din HTTP-server via http://www.dinserver.se/~användare. Du kommer att få "
 "frågan om namnet på den här katalogen senare."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Moduler:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4011,7 +4006,7 @@ msgstr ""
 "Låter användare få en katalog i sina hemkataloger tillgänglig på din HTTP-"
 "server via http://www.dinserver.se/~användare."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4019,28 +4014,28 @@ msgstr ""
 "Ange namnet på katalogen som användare ska skapa i sina hemkataloger (utan "
 "~/) för att den ska bli tillgänglig via http://www.dinserver.se/~användare"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Du måste ställa in en Ldap server först."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "Användar-HTTP-underkatalog: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ange sökvägen till katalogen som du vill ska vara dokumentrot."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Dokumentrot:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Konfigurerar webbservern"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4048,30 +4043,41 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera "
 "webbservern"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Webbserver för Intranät:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Webbserver för Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Användarkatalog:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Guiden lyckades med att konfigurera Intranät/Internet-webbservern"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerar ditt system som Apache server ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "Kommandot körs fortfarande. Vill du stoppa det och avsluta Guiden?"
+
+#~ msgid "Close"
+#~ msgstr "Stäng"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "DNS-slavserver"
+
 #~ msgid "Mail domain:"
 #~ msgstr "E-post domän:"
 
diff --git a/po/ta.po b/po/ta.po
index 6d471d1b..d7164651 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -22,8 +22,8 @@ msgstr "வடிவமைப்பு மாயாவி"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 #, fuzzy
 msgid "Warning."
 msgstr "எச்சரிக்ைக"
@@ -36,17 +36,17 @@ msgstr "பிழை. "
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "வாழ்த்துக்கள்"
 
@@ -126,44 +126,44 @@ msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 #, fuzzy
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "பிழை"
 
@@ -221,15 +221,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "மூடு"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP மாயாவி"
@@ -316,8 +307,8 @@ msgstr "உங்கள் DHCP சேவைகளை வடிவமைக்�
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "முடமாக்கப்பட்டுள்ளது"
 
@@ -325,8 +316,8 @@ msgstr "முடமாக்கப்பட்டுள்ளது"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "செயல்படுத்தப்பட்டுள்ளது"
 
@@ -345,13 +336,13 @@ msgstr "இந்த மாயாவி உங்கள் DHCP சேவைக�
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "தோல்வி"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -677,19 +668,25 @@ msgstr "செய்தியஞ்சல் சேவையகம்"
 msgid "NFS server"
 msgstr "NFS சேவையகம்"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "தரவுத்தளச் சேவையகம்"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP சேவையகம்"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "டிரேக்மாயாவியின் மாயாவித்  தேர்வு"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "தயவுசெய்து ஒரு மாயாவியைத் தேர்வுச் செய்யவும்"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -699,7 +696,7 @@ msgstr ""
 "\"அடுத்து\" என்றால் நிறுவப்படும்,\n"
 "இல்ைலயெனில் \"தவிர்\" என்றால் நிறுவப்படாமல் வெளிச்ெசல்லும்"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
 
@@ -971,11 +968,6 @@ msgstr "சம்பா வடிவமைப்பு மாயாவி"
 msgid "Master kolab server"
 msgstr "NFS சேவையகம்"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "NFS சேவையகம்"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1001,22 +993,22 @@ msgstr "வலையத்தளச் சேவையக வடிவமைப�
 msgid "Master or slave Kolab server"
 msgstr "NFS சேவையகம்"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "NFS சேவையகம்"
@@ -1092,7 +1084,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1129,21 +1124,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "தரவுத்தளச் சேவையகம்"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "சம்பா மாயாவி"
@@ -1505,7 +1499,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "அடைவு:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "தாங்கள் ெகாடுத்த பாைத காணப்படவில்ைல"
 
@@ -2135,7 +2129,7 @@ msgid ""
 msgstr "உங்கள் பினாமியை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3759,19 +3753,19 @@ msgstr "FTP சேவையகம் வடிவமைக்கப்படு�
 msgid "OpenSSH server"
 msgstr "உள்ளமை வலையத்தளச் சேவையகம்:"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "நேர மாயாவி"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "மீண்டும் முயற்சி செய்யுங்கள்"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "வடிவமைப்ைபச் சோதிக்காமல் சேமிக்கவும்"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3779,55 +3773,55 @@ msgstr ""
 "இந்த மாயாவி நேரச் சேவையை உள்ளமை அமைப்பாகவோ அல்லது  இணையவழி வெளிப்புற சேவையகம் "
 "மூலமாகவோ உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைக்க உதவும்"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "உங்கள் வலையமைப்பிற்கு உங்கள் கணினி நேரச் சேவையகமாக பணியாற்றும்"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "அடுத்தது என்ற பொத்தானை தேர்வுச்ெசய்து மாயாவியை தொடங்கு, அல்லது  தவிர் என்ற "
 "பொத்தானைதேர்வுச்ெசய்து வெளியேறு."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr ""
 "கீழே கொடுக்கப்பட்டுள்ள பட்டியலில் அடிப்படை மற்றும் துணை சேவையகங்களை தேர்வு செய்யுங்கள்"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "நேரச் சேவையகங்கள்"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "அடிப்படை நேரச் சேவையகம்:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "துணை நேரச் சேவையகம்:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "உங்கள் கால மண்டலத்ைத தேர்வு செய்யுங்கள்"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 #, fuzzy
 msgid "Choose a region:"
 msgstr "உங்கள் கால மண்டலத்ைத தேர்வு செய்யுங்கள்"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 #, fuzzy
 msgid "Choose a city:"
 msgstr "உங்கள் கால மண்டலத்ைத தேர்வு செய்யுங்கள்"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3835,35 +3829,35 @@ msgstr ""
 "உங்கள் நேரச் சேவையகம் தற்ேபாது அணுக முடியவில்ைலயெனில் 30 விநாடிகள் கழித்து மீண்டும் "
 "முயற்சிக்கப்படும்"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "நேரச் சேவையகத்ைதச் சோதிக்க அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "நேரச் சேவையகம் சோதிக்கப்படுகிறது"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "கால மண்டலம்"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "நேரச் சேவையகம் பதிலளிக்கவில்ைல. இதற்கான காரனங்கள்:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- நேரச் சேவையகம் இல்ைல"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- வெளி வலையமைப்பு ஏதுமில்ைல"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- வேறு காரணங்கள்"
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3872,11 +3866,11 @@ msgstr ""
 "நீங்கள் மீண்டும் நேரச் சேவையகத்தோடு இணைய முயற்சிக்கலாம், இல்ைலயென்றால் இப்ேபாதைக்கு "
 "வடிவமைப்ைப சேமித்துவிட்டு பிறகு நேரத்ைத சரிசெய்துக் கொள்ளலாம்"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "நேரச் சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "உங்கள் கணினி தற்ேபாது உங்கள் உள்ளமை வலையமைப்பிற்கு நேரச் சேவையகமாக பணியாற்ற முடியும்"
@@ -3918,15 +3912,15 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr "உங்கள் வலையத்தளத்ைத உள்ளமை வலையமைப்புக்கும் இணையத்திற்கும்சேர்த்துச்  செயல்படுத்தலாம்"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத உள்ளமை வலையமைப்புக்கு மட்டும் செயல்படுத்து"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத இணையத்திற்கு செயல்படுத்து"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3935,11 +3929,11 @@ msgstr ""
 "*பயனர் கூறு; பயனர்கள் http://www.yourserver.com/~user என்ற வகையில் வலைதளம் "
 "உருவாக்கதங்கள் இல்ல அைடவில் உருவாக்க ேவண்டிய அைடவின் ெபயர், இது பின்னர் ேகட்கப்படும்"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "கூறுகள்"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3948,7 +3942,7 @@ msgstr ""
 "*பயனர் கூறு; பயனர்கள் http://www.yourserver.com/~user என்ற வகையில் வலைதளம் "
 "உருவாக்கதங்கள் இல்ல அைடவில் உருவாக்க ேவண்டிய அைடவின் ெபயர், இது பின்னர் ேகட்கப்படும்"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3956,60 +3950,67 @@ msgstr ""
 "பயனர்கள் http://www.yourserver.com/~user என்ற வகையில் வலைதளம் உருவாக்கதங்கள் இல்ல "
 "அைடவில் உருவாக்க ேவண்டிய அைடவின் ெபயர்"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "தரவுத்தளச் சேவையகம்"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "பயனர் http துைன-அைடவு "
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "நீங்கள் document root க்காக இருக்க ேவண்டிய அைடவை ேதர்வுச்ெசய்"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "வலையத்தளச் சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "உள்ளமை வலையத்தளச் சேவையகம்:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "இணைய வலையத்தளச் சேவையகம்"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "பயனர் அடைவு:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "இந்த மாயாவி வலையத்தளச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Apache server"
 msgstr "உள்ளமை வலையத்தளச் சேவையகம்:"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
+#~ msgid "Close"
+#~ msgstr "மூடு"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "NFS சேவையகம்"
+
 #, fuzzy
 #~ msgid "Install in progress"
 #~ msgstr "பயனர் அடைவு:"
diff --git a/po/tg.po b/po/tg.po
index c7763214..9bc5700d 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-12-04 07:49+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -28,8 +28,8 @@ msgstr "устоди ба танзимдарорӣ"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Огоҳӣ."
 
@@ -41,17 +41,17 @@ msgstr "Хатогӣ."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Табрик мекунем"
 
@@ -130,43 +130,43 @@ msgid "Warning"
 msgstr "Огоҳ"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Хатогӣ"
 
@@ -232,17 +232,6 @@ msgstr ""
 "Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи он "
 "drakconnect-ро сар диҳед."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Фармон дар иҷроиш аст. Оё мехоҳед, ки онро нест кунед ва кори устодро ба "
-"итмом расонед?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Пӯшидан"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Устоди DHCP"
@@ -332,8 +321,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "хомўш"
 
@@ -341,8 +330,8 @@ msgstr "хомўш"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "дар гиронида"
 
@@ -360,13 +349,13 @@ msgstr "Устод бо муваффақият DHCP хидматрасонро �
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Бо нокомӣ анҷомид"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Drakwizard-ро бозоғоз намоед ва баъзе гузаришҳоро тағир намоед."
 
@@ -687,19 +676,24 @@ msgstr "Хидматрасони нав"
 msgid "NFS server"
 msgstr "хидматрасони NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Хидматрасони Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Хидматрасони FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Интихобҳои устоди Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Илтимос устодро интихоб кунед"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -709,7 +703,7 @@ msgstr ""
 "Пахш намоед \"Оянда\" барои насб намудан ё ин ки \"Бекор кардан\" барои "
 "хориҷшавӣ"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
@@ -1014,11 +1008,6 @@ msgstr "Устоди батанзимдарории Kolab"
 msgid "Master kolab server"
 msgstr "Хидматрасони соҳиби DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Хидматрасони фармонбари DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1050,22 +1039,22 @@ msgstr "Марҳамат намоед ба Устоди танзими хидм�
 msgid "Master or slave Kolab server"
 msgstr "Хидматрасони соҳиби DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Шумо аллакай Хидматрасони LDAP-и худро танзим кардаед"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Хидматрасони фармонбари DNS"
@@ -1142,7 +1131,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1176,22 +1168,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Хидматрасони kolab танзим шуд ва ҳоло ба кор андохта шуда истодааст. Ҳамчун "
 "'мудир' бо гузарвожаи воридкардаатон дар https://127.0.0.1/kolab/admin/, "
 "ворид шавед."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Танзимкунии хидматрасони Kolab дар системаи шумо..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Хидматрасони Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Устоди Ldap"
@@ -1542,7 +1535,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "феҳрист"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Роҳи Ки шумо дохил кардед вуҷуд надорад"
 
@@ -2204,7 +2197,7 @@ msgid ""
 msgstr "Устод параметрҳои зеринро барои танзими proxyи Шумо ҷамъ кард:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3878,19 +3871,19 @@ msgstr "Хидматрасони Samba-и шумо ба танзим даров�
 msgid "OpenSSH server"
 msgstr "Хидматрасони Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Устоди вакт"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Аз нав кўшиш кунед"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Нигоҳ доштани файли танзимдарориро бе санҷиш"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3898,19 +3891,19 @@ msgstr ""
 "Ин Устод барои гузоштани вақти хидмарасони шумо бо хидмтрасони вақти беруна "
 "хангомашуда ёри мерасонад."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Барои хамин хидматрасони шумо барои шабакаи шумо хидматрасони вакти махалли "
 "мешавад"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "барои давом додан навбатиро ва барои аз устод баромадан бекор карданро пазш "
 "кунед"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3919,35 +3912,35 @@ msgstr ""
 "намоед, зеро ин хидматрасон ногаҳон хидматрасонҳои вақти мавҷудбударо нишон "
 "медиҳад)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Аз рўйхат хидматрасони асосӣ ва дуюминро интихоб кунед."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Хидмарасонхои Вақт"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Хидматрасони Вакти Аввала:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Дуюмин Хидматрасони вақт"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Маҳали вақтро интихоб кунед"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Минтақаро интихоб намудан:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Мамлакатро интихоб намудан:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3955,35 +3948,35 @@ msgstr ""
 "Агар хидматрасони вақт ҳозир дастрас набошад (шабака ё ягон сабаби дигар), "
 "30 сония барои андармонӣ ҳаст"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Барои оғози санҷиши хидматрасонҳои вақт навбатӣ-ро пахш кунед."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Санҷиши дастрас будани хидматрасони вақт"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Маҳалли вақт:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Хидматрасонҳои вақт ҷавоб намедиҳанд. Сабабҳои зерин шуда метавонанд:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- хидматрасони вақти вуҷуд надошта"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- ягон шабакаи беруна нест"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- сабаҳои дигар..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3991,11 +3984,11 @@ msgstr ""
 "- Шумо метавонед боз кӯшиш намоед, то ки бо хидматрасонҳои вақт дар тамос "
 "бошед ё бе муқаррар намудани вақт танзимдарориро нигоҳ доред."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Танзимдарории хидматрасони вакт нигох дошта шуд"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Хидматрасони шумо барои шабакаи шумо хамчун хидматрасони вакти махалли амал "
@@ -4041,15 +4034,15 @@ msgstr ""
 "Хидматрасони Шумо хамчун Web Хидматрасон ба шабакаи дохилӣ (intranet) ва "
 "хамчун Web Хидматрасон барои Internet амал карда метавонад."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Web Хидматрасонро барои Intranet дар гиронед"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Web Хидматрасонро барои Internet дар гиронед"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4059,11 +4052,11 @@ msgstr ""
 "хонаги, ки дар http хидматрасон ба воситаи://www.yourserver.com/~user, "
 "доранд, баъдан аз шумо номи ин феҳрист пурсида мешавад"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "одулҳо:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4074,7 +4067,7 @@ msgstr ""
 "Онҳо дар http server via http://www.yourserver.com/~user-и шумо мавҷуд "
 "ҳастанд."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4082,28 +4075,28 @@ msgstr ""
 "Номи феҳристе ки корвандон бояд дар хонаи худ офаранд чоп кунед (бе ~/ ) "
 "инро метавонед аз http://www.yourserver.com/~user гиред"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Дар авваал шумо бояд Ldap хидматрасонро барпо созед."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "http зерфеҳрасти корванд: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Номи феҳристе, ки Шумо онро решаи ҳуҷҷат кардан мехоҳед нишон диҳед."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Решаи ҳуҷҷат"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Танзимдарории Web Хидматрасон"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4111,33 +4104,46 @@ msgstr ""
 "Устод параметрҳои зеринро ки дар Web Хидматрасони Шумо бояд танзим дода "
 "шавад пайдо кард"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Web хидматрасони Intranet"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "web хидматрасони Internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Феҳристи корванд"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Устод бомувафаққона Web Хидматрасони Intranet/Internet-и Шуморо танзим кард"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Хидматрасони Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 "Системаи шумо ҳамчун хидматрасони Apache ба танзим дороварда шуда "
 "истодааст ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Фармон дар иҷроиш аст. Оё мехоҳед, ки онро нест кунед ва кори устодро ба "
+#~ "итмом расонед?"
+
+#~ msgid "Close"
+#~ msgstr "Пӯшидан"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Хидматрасони фармонбари DNS"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Пости домен:"
 
diff --git a/po/tl.po b/po/tl.po
index 99265f72..ffa99176 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-04 15:19+0000\n"
 "Last-Translator: Renoir P. Deloso <renoir@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -24,8 +24,8 @@ msgstr "configuration wizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Babala."
 
@@ -37,17 +37,17 @@ msgstr "Error."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Maligayang bati"
 
@@ -127,44 +127,44 @@ msgid "Warning"
 msgstr "Babala"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Ikaw ay nasa dhcp, ang server ay maaaring hindi gagana gamit ang "
 "configuration mo."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Error"
 
@@ -228,17 +228,6 @@ msgstr ""
 "(wala). Ang hostname ay kinakailangang FQDN: Fully Qualified Domain Name."
 "Ilunsad ang drakconnect para i-adjust ito."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Ang command ay tumatakbo pa rin. Gusto niyo ba itong isara (kill it) at "
-"lumabas sa Wizard?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Isara"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Wizard"
@@ -330,8 +319,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "naka-disable"
 
@@ -339,8 +328,8 @@ msgstr "naka-disable"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "naka-enable"
 
@@ -358,13 +347,13 @@ msgstr "Matagumpay na na-configure ng wizard ang mga DHCP service."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Nabigo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ilunsad muli ang drakwizard, at subukang baguhin ang ilang parameter."
 
@@ -687,19 +676,24 @@ msgstr "News server"
 msgid "NFS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Pagpili ng wizard ng Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Pumili ng wizard"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -708,7 +702,7 @@ msgstr ""
 "%s ay hindi naka-install\n"
 "I-click ang \"Kasunod\" para i-install o ang \"I-cancel\" para hindi tumuloy"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Nabigo ang pag-i-install"
 
@@ -1003,11 +997,6 @@ msgstr "Kolab configuration wizard"
 msgid "Master kolab server"
 msgstr "Master DNS server"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Slave DNS server"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1040,22 +1029,22 @@ msgstr "Maligayang pagdating sa Kolab Groupware server configuration Wizard."
 msgid "Master or slave Kolab server"
 msgstr "Master DNS server"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Nai-configure niyo na ang inyong Ldap Server"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Slave DNS server"
@@ -1131,7 +1120,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1166,22 +1158,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. 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, sa https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Kino-configure ang Kolab server sa iyong sistema..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap wizard"
@@ -1534,7 +1527,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Ang path (landas) na ipinasok mo ay wala."
 
@@ -2201,7 +2194,7 @@ msgstr ""
 "configure ng iyong proxy:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3875,19 +3868,19 @@ msgstr "Kino-configure ang Samba server mo..."
 msgid "OpenSSH server"
 msgstr "Apache server"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Time wizard"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Subukan muli"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "I-save ang config na walang pagsubok"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3895,18 +3888,18 @@ msgstr ""
 "Itong wizard ay tutulong sa iyo na gawin ang oras ng iyong server na naka-"
 "synchronize sa isang panglabas na time server."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 "Samakatuwid ang server mo ay magiging local na time server para sa network "
 "mo."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "pinduting ang 'Kasunod' para magsimula, o 'I-cancel' para iwanan itong wizard"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3915,35 +3908,35 @@ msgstr ""
 "dahil ang server na ito ay random na tumuturo sa mga available na time "
 "server)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Pumili ng primary at secondary server mula sa talaan."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Mga time server"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Primary time server:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Secondary time server:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Pumili ng timezone"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Pumili ng rehiyon:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Pumili ng lungsod:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3951,35 +3944,35 @@ msgstr ""
 "Kung ang time server ay hindi kaagad available (dahil sa network o ibang "
 "dahilan), magkakaroon ng delay na mga 30 segundo."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Pindutin ang 'Kasunod' para umpisahan ang pagsubok ng mga time server."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Sinusubukan ang pagiging available ng mga time server"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Time zone:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Ang mga time server ay hindi sumasagot. Mga maaaring dahilan:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- mga walang time server"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- walang network sa labas"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- mga iba pang dahilan..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3987,11 +3980,11 @@ msgstr ""
 "- Maaari mong subukan muling makipag-alam sa mga time server, o i-save ang "
 "configuration na hindi talaga sine-set ang oras."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Nai-save ang configuration ng time server"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Ngayon, ang server mo ay maaaring gumanap bilang time server para local "
@@ -4038,15 +4031,15 @@ msgstr ""
 "Ang server mo ay maaaring gumanap bilang Web server patungo sa iyong "
 "pangloob na network (intranet) at bilang Web server para sa Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Paganahin ang Web server para sa intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Paganahin ang Web server para sa Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4057,11 +4050,11 @@ msgstr ""
 "http://www.servermo.com/~user, ikaw ay tatanungin para sa pangalan nitong "
 "directory pagkatapos."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Mga module:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4071,7 +4064,7 @@ msgstr ""
 "kanilang mga home directory na available sa iyong http (web) server via "
 "http://www.servermo.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4080,29 +4073,29 @@ msgstr ""
 "home (walang ~/) para makuha itong available via http://www.servermo.com/"
 "~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Kailangan niyo munang mag-setup ng Ldap server."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "user http sub-directory: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "I-type ang path/landas ng directory na gusto mong maging document root."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Document root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Kino-configure ang Web server"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4110,31 +4103,44 @@ msgstr ""
 "Naipon ng wizard ang mga sumusunod na parameter na kailangan para ma-"
 "configure ang iyong Web server:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet web server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet web server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "User directory:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Matagumpay na na-configure ng wizard ang iyong intranet/Internet Web server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache server"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Kino-configure ang sistema mo bilang Apache server ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Ang command ay tumatakbo pa rin. Gusto niyo ba itong isara (kill it) at "
+#~ "lumabas sa Wizard?"
+
+#~ msgid "Close"
+#~ msgstr "Isara"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Slave DNS server"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Mail domain:"
 
diff --git a/po/tr.po b/po/tr.po
index a57e8d7f..493fd9d8 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\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"
@@ -28,8 +28,8 @@ msgstr "yapılandırma sihirbazı"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Uyarı."
 
@@ -41,17 +41,17 @@ msgstr "Hata."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Tebrikler"
 
@@ -128,42 +128,42 @@ msgid "Warning"
 msgstr "Uyarı"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Hata"
 
@@ -228,15 +228,6 @@ msgstr ""
 "alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
 "Ayarlamak için drakconnect'i çalıştırın."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Kapat"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP Sihirbazı"
@@ -327,8 +318,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "Pasif"
 
@@ -336,8 +327,8 @@ msgstr "Pasif"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "Etkin"
 
@@ -357,13 +348,13 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Başarısız"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Drakwizard'ı kapatıp açın ve bazı parametreleri değiştirmeyi deneyin."
 
@@ -691,19 +682,25 @@ msgstr "Haber sunucusu"
 msgid "NFS server"
 msgstr "NFS sunucusu"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+#, fuzzy
+msgid "Kolab server"
+msgstr "Samba sunucusu"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP sunucusu"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard sihirbaz seçimi"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Lütfren bir sihirbaz seçin"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -713,7 +710,7 @@ msgstr ""
 "\"Sonraki\" tuşuna basarak kurulumu başlatabilirsiniz veya\n"
 "\"İptal\" tuşuna basarak yüklemekten vazgeçebilirsiniz"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Kurulum başarısız oldu"
 
@@ -1023,11 +1020,6 @@ msgstr "yapılandırma sihirbazı"
 msgid "Master kolab server"
 msgstr "Ana DNS sunucusu"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "İkincil DNS sunucusu"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1053,22 +1045,22 @@ msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 msgid "Master or slave Kolab server"
 msgstr "Ana DNS sunucusu"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Sihirbaz, vekil sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "İkincil DNS sunucusu"
@@ -1144,7 +1136,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1180,21 +1175,20 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-#, fuzzy
-msgid "Kolab server"
-msgstr "Samba sunucusu"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap sihibazı"
@@ -1569,7 +1563,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Dizin:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Girmiş olduğunuz yol bulunmamaktadır."
 
@@ -2224,7 +2218,7 @@ msgstr ""
 "şekilde belirledi:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3884,19 +3878,19 @@ msgstr "Samba sunucunuz yapılandırılıyor....."
 msgid "OpenSSH server"
 msgstr "Apache web sunucusu"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Zamanlama sihirbazı"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Yeniden dene"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Yapılandırmayı denemeden kaydet"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3904,51 +3898,51 @@ msgstr ""
 "Bu sihirbaz sunucunuzun saatini başka bir zaman sunucusuyla eş zamanlı "
 "olarak ayarlamanızda size yardımcı olacak."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Öyleyse sunucunuz ağınız için yerel zaman sunucusu olacak."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "başlamak için İleri'ye veya sihirbazdan çıkmak için İptal'e basın"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Listeden bir birincil ve ikincil sunucu seçin."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Zaman sunucuları"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 #, fuzzy
 msgid "Primary time server:"
 msgstr "Birincil Zaman Sunucusu"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 #, fuzzy
 msgid "Secondary time server:"
 msgstr "İkincil Zaman Sunucusu:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Bir zaman dilimi seçin"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Bir bölge seçin:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Bir şehir seçin:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3956,35 +3950,35 @@ msgstr ""
 "Eğer zaman sunucusu hemen ulaşılabilir değilse (ağ sorunu veya başka bir "
 "neden yüzünden) 30 saniye kadar bekleyeceksiniz."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "İleri'ye basarak zaman sunucuları testini başlatın."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Zaman sunucularının geçerliliği deneniyor"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Zaman dilimi:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Zaman sunucuları cevap vermiyor. Olası nedenler:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- varolmayan zaman sunucuları"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- dış ağ yok"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- başka sebepler..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 #, fuzzy
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
@@ -3993,11 +3987,11 @@ msgstr ""
 "Zaman sunucularına bağlanmayı deneyebilirsiniz ya da şimdi saati ayarlamadan "
 "yapılandırmayı kaydedebilirsiniz."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Zaman sunucusu yapılandırması kaydedildi"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Sunucunuz yerel ağınız için artık bir zaman sunucusu olabilir."
 
@@ -4045,17 +4039,17 @@ msgstr ""
 "Sunucunuz hem yerel ağınızda (intranetinizde) hem de Internet'te Web "
 "Sunucusu olarak davranabilir."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "Enable the Web server for the intranet"
 msgstr "Web Sunucusunu Intranet için etkinleştir"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Enable the Web server for the Internet"
 msgstr "Web Sunucusunu Internet için etkinleştir"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4065,11 +4059,11 @@ msgstr ""
 "http sunuvusu için erişilebilir kılar.[http://www.sunucunuz.com/~user] Size "
 "sizin ismi sonradan sorulacaktır."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modüller:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4079,7 +4073,7 @@ msgstr ""
 "http sunuvusu için erişilebilir kılar.[http://www.sunucunuz.com/~user] Size "
 "sizin ismi sonradan sorulacaktır."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4088,29 +4082,29 @@ msgstr ""
 "kullanıcıların kendi ev dizinleri altında oluşturmaları gereken dizinin "
 "adını girin (~/ kısmı hariç)"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "PXE sunucusu kur."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "kullanıcı http alt-dizini: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Döküman kökü yapmak istediğiniz dizinin yolunu giriniz."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Döküman kökü:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 #, fuzzy
 msgid "Configuring the Web server"
 msgstr "Web Sunucusu yapılandırılıyor"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
@@ -4119,32 +4113,39 @@ msgstr ""
 "Web Sunucunuzu yapılandırmak için gereken parametreleri sihirbaz şu şekilde "
 "belirledi:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet web sunucusu:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet web sunucusu:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Kullanıcı dizini:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 #, fuzzy
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Sihirbaz, Intranet/Internet Web Sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache web sunucusu"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Apache Web Sunucu olarak yapılandırılıyor ..."
 
+#~ msgid "Close"
+#~ msgstr "Kapat"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "İkincil DNS sunucusu"
+
 #, fuzzy
 #~ msgid "Mail domain:"
 #~ msgstr "NIS Alan:"
diff --git a/po/uk.po b/po/uk.po
index 10de1b63..da35e1ce 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of drakwizard-uk.po to ukrainian
-# $Id: uk.po,v 1.118 2005-09-05 11:59:58 pablo Exp $
+# $Id: uk.po,v 1.119 2005-09-08 18:35:41 fwang Exp $
 # Ukrainian translation of drakwizard
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Gladky Dima <gladimdim@mail.ru>, 2002.
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-01-26 13:50+0200\n"
 "Last-Translator: Taras Boychuk <btr1@ukrpost.net>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -26,8 +26,8 @@ msgstr "Помічник налаштування"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Попередження."
 
@@ -39,17 +39,17 @@ msgstr "Помилка."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Поздоровляємо"
 
@@ -126,42 +126,42 @@ msgid "Warning"
 msgstr "Попередження"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Помилка"
 
@@ -224,16 +224,6 @@ msgstr ""
 "правильну назву домену, не таку саму, як назва локального домена, і не "
 "порожню. Виконайте drakconnect, щоб виправити."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Команда все ще виконується. Ви хочете припинити її і вийти з Помічника?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Закрити"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Помічник DHCP"
@@ -324,8 +314,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "вимкнено"
 
@@ -333,8 +323,8 @@ msgstr "вимкнено"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "увімкнено"
 
@@ -352,13 +342,13 @@ msgstr "Помічник успішно налаштував сервіси DHCP
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Збій"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустіть drakwizard і спробуйте змінити деякі параметри."
 
@@ -676,19 +666,24 @@ msgstr "Сервер новин"
 msgid "NFS server"
 msgstr "Сервер NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Сервер Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Сервер FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Вибір Помічника Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Будь ласка, виберіть Помічника"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -697,7 +692,7 @@ msgstr ""
 "%s не встановлено\n"
 "Натисніть \"Далі\", щоб встановити, або \"Скасувати\", щоб вийти"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Встановлення завершилося невдало"
 
@@ -984,11 +979,6 @@ msgstr "Помічник налаштування Kolab"
 msgid "Master kolab server"
 msgstr "Головний сервер DNS"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Підлеглий сервер DNS"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1021,22 +1011,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Головний сервер DNS"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Сервер Ldap вже було налаштовано"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Підлеглий сервер DNS"
@@ -1112,7 +1102,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1146,21 +1139,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Сервер kolab налаштовано і запущено. Зареєструйтеся з ім'ям 'manager' і "
 "паролем, який Ви ввели, за адресою https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Налаштовується сервер kolab на Вашій системі..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Сервер Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Помічник Ldap"
@@ -1507,7 +1501,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Тека:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Шляху, який Ви ввели, не існує."
 
@@ -2163,7 +2157,7 @@ msgstr ""
 "Помічник зібрав наступні параметри, які потрібні для налаштування проксі:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3832,19 +3826,19 @@ msgstr "Налаштування сервера Samba..."
 msgid "OpenSSH server"
 msgstr "Сервер Апачі"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Помічник часу"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Спробуйте ще"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Зберегти конфігурацію без тесту"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3852,15 +3846,15 @@ msgstr ""
 "Цей Помічник допоможе Вам встановити час на Вашому сервері, синхронізований "
 "з зовнішнім часовим сервером."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Таким чином, Ваш сервер став локальним часовим сервером Вашої мережі."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "натисніть далі, щоб почати, або скасувати, щоб вийти з цього Помічника"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3868,35 +3862,35 @@ msgstr ""
 "(ми рекомендуємо використання сервера pool.ntp.org двічі, оскільки він "
 "звіряється з діючими серверами часу методом випадкового вибору)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Виберіть первинний і вторинний сервери зі списку."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Часові сервери"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Первинний часовий сервер:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Вторинний часовий сервер:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Виберіть часову зону"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Виберіть регіон:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Виберіть місто:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3904,35 +3898,35 @@ msgstr ""
 "Якщо часовий сервер одразу недоступний (через мережу або з іншої причини), "
 "то буде затримка на 30 секунд."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Натисніть далі, щоб запустити тест серверів часу."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Тестую на наявність часових серверів"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Часова зона:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Часові сервери не відповідають. Причиною цього може бути:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- неіснуючі часові сервери"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- немає зовнішньої мережі"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- інші причини..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3940,11 +3934,11 @@ msgstr ""
 "Ви можете спробувати з'єднатися з часовими серверами ще раз, або зберегти "
 "конфігурацію без встановлення часу."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Конфігурацію часового сервера збережено"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "Ваш сервер зараз може бути часовим сервером для локальної мережі."
 
@@ -3985,15 +3979,15 @@ msgstr ""
 "Ваш сервер може бути веб-сервером для Вашої місцевої мережі (intranet) і веб-"
 "сервером для Інтернету"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Увімкнути веб-сервер для інтранет"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Увімкнути веб-сервер для Інтернету"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -4003,11 +3997,11 @@ msgstr ""
 "Вашому http-сервері через http://www.yourserver.com/~user, пізніше Вам "
 "потрібно буде ввести назву цієї теки."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Модулі:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -4016,7 +4010,7 @@ msgstr ""
 "* Модуль користувача: дозволяє користувачам мати теку в домівці, доступну на "
 "Вашому http-сервері через http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -4024,28 +4018,28 @@ msgstr ""
 "Введіть назву теки, яку користувачі повинні створити у своїх домівках (без "
 "~/), щоб зробити їх доступними через http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Спочатку потрібно встановити сервер Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "підлегла http-тека користувача: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Введіть шлях до теки, яку Ви хочете зробити місцем для документів."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Місце для документів:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Налаштування веб-сервера"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4053,30 +4047,42 @@ msgstr ""
 "Помічник зібрав наступні дані, які потрібні для налаштування Вашого веб-"
 "сервера"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Інтранет веб-сервер:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Інтернет веб-сервер:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Тека користувача:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Помічник успішно налаштував Ваш Інтранет/Інтернет веб-сервер"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Сервер Апачі"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Налаштовую Вашу систему в якості сервера Апачі..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Команда все ще виконується. Ви хочете припинити її і вийти з Помічника?"
+
+#~ msgid "Close"
+#~ msgstr "Закрити"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Підлеглий сервер DNS"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Головний домен:"
 
diff --git a/po/uz.po b/po/uz.po
index 15fb861f..9502eecd 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-09-10 22:36+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -22,8 +22,8 @@ msgstr "мослаш учун ёрдамчи"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Диққат."
 
@@ -35,17 +35,17 @@ msgstr "Хато."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Табриклаймиз"
 
@@ -118,43 +118,43 @@ msgid "Warning"
 msgstr "Диққат"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Хато"
 
@@ -209,15 +209,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Ёпиш"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP ёрдамчиси"
@@ -298,8 +289,8 @@ msgstr "DHCP хизматини мослаш учун ёрдамчи қуйид�
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "ўчирилган"
 
@@ -307,8 +298,8 @@ msgstr "ўчирилган"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "ёқилган"
 
@@ -326,13 +317,13 @@ msgstr "Ёрдамчи DHCP хизматларини муваффақиятли
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Муваффақиятсиз тугади"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -624,19 +615,24 @@ msgstr "Янги сервер"
 msgid "NFS server"
 msgstr "NFS сервери"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab сервери"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP сервери"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Ёрдамчини танлаш"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Илтимос ёрдамчини танланг"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -645,7 +641,7 @@ msgstr ""
 "%s ўрнатилмаган\n"
 "Ўрнатиш учун \"Кейинги\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
@@ -908,11 +904,6 @@ msgstr "Kolab серверини мослаш учун ёрдамчи"
 msgid "Master kolab server"
 msgstr "Асосий DNS сервери"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Иккиламчи DNS сервери"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -937,22 +928,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Асосий DNS сервери"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Ёрдамчи Samba серверингизни муваффақиятли мослади."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Иккиламчи DNS сервери"
@@ -1025,7 +1016,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1059,19 +1053,19 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери мосланмоқда..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab сервери"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap ёрдамчиси"
@@ -1419,7 +1413,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Сиз киритган йўл мавжуд эмас."
 
@@ -2024,7 +2018,7 @@ msgstr ""
 "Прокси серверингизни мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3602,113 +3596,113 @@ msgstr "Samba сервери мосланмоқда..."
 msgid "OpenSSH server"
 msgstr "Apache сервери"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Вақт ёрдамчиси"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Яна уриниб кўринг"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Бошлаш учун \"Кейинги\"ни босинг. Ёрдамчидан чиқиш учун \"Бекор қилиш\"ни "
 "босинг."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Рўйхатдан асосий ва иккиламчи серверларни танланг."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Вақт серверлари"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Асосий вақт сервери:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Иккиламчи вақт сервери:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Вақт зонасини танлаш"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Регионни танланг:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Шаҳарни танланг:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Вақт зонаси:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- вақт сервери мавжуд эмас"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- бошқа сабаблар..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Энди серверингиз локал тармоқ учун вақт сервери сифатида хизмат қилиши "
@@ -3751,89 +3745,96 @@ msgstr ""
 "Серверингиз ички тармоқ (интранет) ва Интернет учун Веб сервери сифатида "
 "хизмат қилиши мумкин."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Интранет учун Веб серверини ёқиш"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Интернет учун Веб серверини ёқиш"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Модуллар:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "LDAP серверини ўрнатиш."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Веб сервери мосланмоқда"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "Веб серверингизни мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Интранет учун веб сервер:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Интернет веб сервер:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Фойдаланувчининг директорияси:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Ёрдамчи Интранет/Интернет учун Веб серверингизни муваффақиятли мослади."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache сервери"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Тизим Apache сервер сифатида мосланмоқда..."
 
+#~ msgid "Close"
+#~ msgstr "Ёпиш"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Иккиламчи DNS сервери"
+
 #~ msgid "Install in progress"
 #~ msgstr "Ўрнатиш давом этмоқда"
 
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index c6407691..5ffa696a 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-09-10 22:36+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -22,8 +22,8 @@ msgstr "moslash uchun yordamchi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Diqqat."
 
@@ -35,17 +35,17 @@ msgstr "Xato."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Tabriklaymiz"
 
@@ -119,43 +119,43 @@ msgid "Warning"
 msgstr "Diqqat"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Xato"
 
@@ -212,15 +212,6 @@ msgid ""
 "Qualified Domain Name. Launch drakconnect to adjust it."
 msgstr ""
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Yopish"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP yordamchisi"
@@ -303,8 +294,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "o'chirilgan"
 
@@ -312,8 +303,8 @@ msgstr "o'chirilgan"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "yoqilgan"
 
@@ -331,13 +322,13 @@ msgstr "Yordamchi DHCP xizmatlarini muvaffaqiyatli mosladi."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Muvaffaqiyatsiz tugadi"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -629,19 +620,24 @@ msgstr "Yangi server"
 msgid "NFS server"
 msgstr "NFS serveri"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab serveri"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP serveri"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Yordamchini tanlash"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Iltimos yordamchini tanlang"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -651,7 +647,7 @@ msgstr ""
 "O'rnatish uchun \"Keyingi\" yoki chiqish uchun \"Bekor qilish\" tugmasini "
 "bosing"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
@@ -916,11 +912,6 @@ msgstr "Kolab serverini moslash uchun yordamchi"
 msgid "Master kolab server"
 msgstr "Asosiy DNS serveri"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Ikkilamchi DNS serveri"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -945,22 +936,22 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Asosiy DNS serveri"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Yordamchi Samba serveringizni muvaffaqiyatli mosladi."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Ikkilamchi DNS serveri"
@@ -1033,7 +1024,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1067,19 +1061,19 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab serveri moslanmoqda..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab serveri"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap yordamchisi"
@@ -1430,7 +1424,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktoriya:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Siz kiritgan yo'l mavjud emas."
 
@@ -2037,7 +2031,7 @@ msgstr ""
 "Proksi serveringizni moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3621,113 +3615,113 @@ msgstr "Samba serveri moslanmoqda..."
 msgid "OpenSSH server"
 msgstr "Apache serveri"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Vaqt yordamchisi"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Yana urinib ko'ring"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Boshlash uchun \"Keyingi\"ni bosing. Yordamchidan chiqish uchun \"Bekor "
 "qilish\"ni bosing."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Ro'yxatdan asosiy va ikkilamchi serverlarni tanlang."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Vaqt serverlari"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Asosiy vaqt serveri:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Ikkilamchi vaqt serveri:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Vaqt zonasini tanlash"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Regionni tanlang:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Shaharni tanlang:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Vaqt zonasi:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- vaqt serveri mavjud emas"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- boshqa sabablar..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr ""
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Endi serveringiz lokal tarmoq uchun vaqt serveri sifatida xizmat qilishi "
@@ -3771,90 +3765,97 @@ msgstr ""
 "Serveringiz ichki tarmoq (intranet) va Internet uchun Veb serveri sifatida "
 "xizmat qilishi mumkin."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Intranet uchun Veb serverini yoqish"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Internet uchun Veb serverini yoqish"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modullar:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "LDAP serverini o'rnatish."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Veb serveri moslanmoqda"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 "Veb serveringizni moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet uchun veb server:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet veb server:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Foydalanuvchining direktoriyasi:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Yordamchi Intranet/Internet uchun Veb serveringizni muvaffaqiyatli mosladi."
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache serveri"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Tizim Apache server sifatida moslanmoqda..."
 
+#~ msgid "Close"
+#~ msgstr "Yopish"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Ikkilamchi DNS serveri"
+
 #~ msgid "Install in progress"
 #~ msgstr "O'rnatish davom etmoqda"
 
diff --git a/po/vi.po b/po/vi.po
index cf5c1ebf..8f5f84f3 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: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-02-12 19:41+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -26,8 +26,8 @@ msgstr "đồ thuật cấu hình"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Cảnh báo."
 
@@ -39,17 +39,17 @@ msgstr "Lỗi."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Chúc mừng"
 
@@ -126,43 +126,43 @@ msgid "Warning"
 msgstr "Cảnh báo"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Lỗi"
 
@@ -224,15 +224,6 @@ msgstr ""
 "đúng, không tương đương với localdomain hay không có gì. Hostname phải là "
 "FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect để hiệu chỉnh."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Lệnh vẫn đang chạy. Bạn muốn dừng lệnh và thoát khỏi đồ thuật không?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Đóng"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Đồ Thuật DHCP"
@@ -320,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "Tắt"
 
@@ -329,8 +320,8 @@ msgstr "Tắt"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "bật"
 
@@ -348,13 +339,13 @@ msgstr "Đồ thuật cấu hình thành công các dịch vụ DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Lỗi"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Khởi chạy lại drakwizard và thử thay đổi một vài tham số."
 
@@ -670,19 +661,24 @@ msgstr "Máy chủ News"
 msgid "NFS server"
 msgstr "Máy chủ NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab server"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Máy chủ FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Chọn đồ thuật Drakwizard"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Hãy chọn đồ thuật"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -691,7 +687,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:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
@@ -973,11 +969,6 @@ msgstr "Đồ Thuật Cấu Hình Kolab"
 msgid "Master kolab server"
 msgstr "Máy chủ DNS chính"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "Máy chủ DNS phụ"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1009,22 +1000,22 @@ msgstr "Chào Mừng Đồ Thuật Cấu hình Máy Chủ Kolab Groupware!"
 msgid "Master or slave Kolab server"
 msgstr "Máy chủ DNS chính"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "Bạn đã cấu hình Ldap Server rồi"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "Máy chủ DNS phụ"
@@ -1100,7 +1091,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1134,21 +1128,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Máy chủ Kolab đã được cấu hình và đang chạy. Hãy đăng nhập bằng 'manager' "
 "với mật khẩu mà bạn nhập ở https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Đang cấu hình máy chủ Kolab...."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab server"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Đồ thuật Ldap"
@@ -1492,7 +1487,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Thư mục:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Đường dẫn bạn nhập không tồn tại."
 
@@ -2138,7 +2133,7 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây được cần để cấu hình proxy của bạn:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3783,19 +3778,19 @@ msgstr "Đang cấu hình máy chủ Samba..."
 msgid "OpenSSH server"
 msgstr "Máy chủ Apache"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Đồ thuật thời gian"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Thử lại lần nữa"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Lưu cấu hình mà không chạy thử"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3803,16 +3798,16 @@ msgstr ""
 "Đồ thuật này giúp thiết lập thời gian cho máy chủ của bạn được đồng bộ hóa "
 "với một máy chủ thời gian bên ngoài."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Máy chủ của bạn sẽ là một máy chủ thời gian cho mạng cục bộ của bạn."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "nhấn tiếp theo (next) để bắt đầu, hoặc bỏ qua (cancel) để rời khỏi đồ thuật"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3820,35 +3815,35 @@ msgstr ""
 "(nên dùng server pool.ntp.org hai lần vì server này trỏ ngẫu nhiên đến các "
 "time server sẵn có)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Chọn một máy chủ chính và phụ từ danh sách."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Máy Chủ Thời Gian"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Máy chủ Thời gian Chính:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Máy Chủ Thời Gian Phụ:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Chọn múi giờ"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Chọn vùng:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Chọn quốc gia:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3856,35 +3851,35 @@ msgstr ""
 "Nếu máy chủ thời gian không có sẵn ngay (do mạng hay lý do khác), bạn hãy "
 "đợi khoảng 30 giây."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Nhấn Tiếp Theo (next) để bắt đầu thử các máy chủ thời gian."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Kiểm tra tính sẵn sàng của các máy chủ thời gian"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Múi giờ:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Máy chủ thời gian không trả lời. Có thể là do:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- không có máy chủ thời gian nào tồn tại"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- không có mạng bên ngoài"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- những lý do khác..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3892,11 +3887,11 @@ msgstr ""
 "- Bạn có thể thử liên lạc lại với các máy chủ thời gian, hoặc lưu cấu hình "
 "mà không có thiết lập thời gian."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "Đã lưu cấu hình máy chủ thời gian"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Máy chủ của bạn bây giờ có thể hoạt động như một máy chủ thời gian cho mạng "
@@ -3939,15 +3934,15 @@ msgstr ""
 "Máy chủ của bạn có thể hoạt động như một Máy Chủ Web hướng về mạng nội bộ "
 "(intranet) và như một Máy Chủ Web cho Internet."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Bật chạy Máy Chủ Web cho Intranet"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Bật chạy Máy Chủ Web cho Internet"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3957,11 +3952,11 @@ msgstr ""
 "họ sãn có trên máy chủ http của bạn thông qua http://www.yourserver.com/"
 "~user, bạn sẽ được hỏi về tên của thư mục này sau đó."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Các Module:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 #, fuzzy
 msgid ""
 "Allows users to get a directory in their home directories available on your "
@@ -3970,7 +3965,7 @@ msgstr ""
 "Cho phép người dùng lấy thư mục trong thư mục home của họ\n"
 "sẵn có trên máy chủ http của bạn qua http://www.yourserver.com/~user."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3978,58 +3973,70 @@ msgstr ""
 "Nhập tên thư mục mà người dùng sẽ tạo trong nhà (home) của họ (không có ~/) "
 "để lấy nó sẵn qua http://www.yourserver.com/~user"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "Trước tiên, bạn phải thiết lập máy chủ Ldap."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "thư mục con http của người dùng: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "Gõ đường dẫn của thư mục bạn muốn là tài liệu root."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Tài liệu root:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Cấu hình máy chủ web"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Máy Chủ Web của bạn"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Máy chủ web intranet:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Máy chủ web internet:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Thư mục người dùng:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Đồ thuật đã hoàn thành cấu hình Máy Chủ Web Intranet/Internet của bạn"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Máy chủ Apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Cấu hình hệ thống làm máy chủ Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Lệnh vẫn đang chạy. Bạn muốn dừng lệnh và thoát khỏi đồ thuật không?"
+
+#~ msgid "Close"
+#~ msgstr "Đóng"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "Máy chủ DNS phụ"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Mail domain:"
 
diff --git a/po/wa.po b/po/wa.po
index 36ed70ac..2fabae63 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2004-09-05 02:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -24,8 +24,8 @@ msgstr "Macrea d' apontiaedje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "Adviertixhmint."
 
@@ -37,17 +37,17 @@ msgstr "Aroke."
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "Complumints"
 
@@ -126,43 +126,43 @@ msgid "Warning"
 msgstr "Adviertixhmint"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 msgid "You are in dhcp, server may not work with your configuration."
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "Aroke"
 
@@ -225,16 +225,6 @@ msgstr ""
 "d' dominne corek, nén «localdomain» nerén on dominne vude. Enondez "
 "drakconnect po l' candjî."
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr ""
-"Li comande est co en alaedje. El voloz vs touwer eyet cwiter l' macrea?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "Clôre"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Macrea DHCP"
@@ -326,8 +316,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "dismetou"
 
@@ -335,8 +325,8 @@ msgstr "dismetou"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "en alaedje"
 
@@ -354,13 +344,13 @@ msgstr "Li macrea a-st apontyî comifåt les siervices DHCP."
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "Berwete"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Renondez l' macrea, et s' sayîz d' candjî kékes parametes."
 
@@ -679,19 +669,24 @@ msgstr "Sierveu di copinreyes"
 msgid "NFS server"
 msgstr "Sierveu NFS"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Sierveu Kolab"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Sierveu FTP"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Tchoezixhaedje do macrea"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "Tchoezixhoz on macrea s' i vs plait"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -700,7 +695,7 @@ msgstr ""
 "%s n' est nén astalé\n"
 "Clitchîz so «Shuvant» po l' astaler ou so «Rinoncî» po cwiter"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
@@ -983,10 +978,6 @@ msgstr "Macrea d' apontiaedje di Kolab"
 msgid "Master kolab server"
 msgstr "Sierveu kolab mwaisse"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "Sierveu kolab esclåve"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -1019,21 +1010,21 @@ msgstr ""
 msgid "Master or slave Kolab server"
 msgstr "Sierveu kolab mwaisse ou esclåve"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "Vos avoz tchoezi on sierveu kolab mwaisse"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "Vos avoz tchoezi d' apontyî on sierveu Kolab."
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "Sierveu kolab esclåve:"
 
@@ -1106,7 +1097,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1140,22 +1134,23 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Li sierveu kolab est asteure apontyî eyet en alaedje. Elodjîz vs dizo l' no "
 "«manager» (manaedjeu), avou li scret ki vos avoz dné, sol hårdêye "
 "https://127.0.0.1/kolab/admin/."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "Apontiaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Sierveu Kolab"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Macrea Ldap"
@@ -1511,7 +1506,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "Ridant:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "Li tchmin ki vs avoz dné n' egzistêye nén."
 
@@ -2164,7 +2159,7 @@ msgstr ""
 "vosse procsi:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3786,19 +3781,19 @@ msgstr "Apontiaedje do sierveu OpenSSH da vosse..."
 msgid "OpenSSH server"
 msgstr "Sierveu OpenSSH"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "Macrea d' eure"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "Rissayî"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "Schaper l' apontiaedje sins l' sayî"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
@@ -3806,17 +3801,17 @@ msgstr ""
 "Ci macrea chal vos aidrè a wårder l' eure so vosse sierveu sincronijheye "
 "avou on sierveu d' eure då lon."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "Vosse sierveu srè adon li sierveu d' eure po vosse rantoele locåle."
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 "Clitchîz so «Shuvant» po-z ataker, oudonbén so «Rinoncî» po leyî ç' macrea "
 "chal."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3824,35 +3819,35 @@ msgstr ""
 "(nos ricmandans d' eployî li sierveu «pool.ntp.org» deus côps, la k' ci "
 "sierveu la redjibele viè ds ôtes sierveus d' eure a l' astcheyance)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "Tchoezixhoz on sierveu primaire et onk segondaire el djivêye."
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "Sierveus d' eure"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "Sierveu d' eure primaire:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "Sierveu d' eure segondaire:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "Tchoezixhoz en coisse d' eureye"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "Tchoezixhoz ene redjon:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "Tchoezixhoz on payis:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
@@ -3860,35 +3855,35 @@ msgstr ""
 "Si l' sierveu d' eure ni respond nén do côp (cåze del rantoele ou d' ene ôte "
 "råjhon), i gn årè on tårdjaedje d' a pô près 30 segondes."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "Clitchîz so «Shuvant» po-z enonder les sayes do sierveu d' eure."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "Dji saye po vey si les sierveus d' eure rotèt comifåt"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "Coisse d' eureye:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Les sierveus d' eure ni respondèt nén. Ça pout esse cåze ki:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- sierveus d' eure ki n' egzistèt nén"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- nole rantoele po rexhe sol daegntoele"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- ôtès råjhons..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
@@ -3896,11 +3891,11 @@ msgstr ""
 "- Vos ploz rsayî di vs raloyî åzès sierveus d' ôrlodje, oudonbén schaper "
 "l' apontiaedje sins apontyî l' eure."
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "L' apontiaedje do sierveu d' eure a stî schapêye"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr ""
 "Vosse sierveu pout asteure fé do sierveu d' eure pol rantoele da vosse."
@@ -3945,15 +3940,15 @@ msgstr ""
 "Vosse sierveu waibe pout-st ovrer sol rantoele locåle (intranet) eyet sol "
 "daegntoele (internet)."
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "Mete en alaedje li sierveu waibe sol daegntoele"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "Mete en alaedje li sierveu waibe sol daegntoele"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3963,11 +3958,11 @@ msgstr ""
 "ki srè veyou sol sierveu waibe, avou des hårdêyes del sôre « http://www."
 "vosse.sierveu.com/~uzeu », li no do ridant vos srè dmandé pus lon."
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "Modules:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3975,7 +3970,7 @@ msgstr ""
 "Permete ki les uzeus åyexhe dins leus ridants måjhon on ridant ki soeye "
 "veyåve sol daegntoele come http://www.vosse.sierveu.com/~uzeu."
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3983,28 +3978,28 @@ msgstr ""
 "Dinez l' no do ridant k' les uzeus dvèt askepyî dins leus ridants måjhon "
 "sins « ~/ ») po k' i soeye veyåve come http://www.vosse.sierveu.com/~uzeu"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "Vos dvoz dner on ridant d' uzeu."
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "sorridant waibe des uzeus: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Tapez li tchmin do ridant ki vos vloz k' i soeye li raecene des documints."
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "Raecene po les documints:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "Apontiaedje do sierveu waibe"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
@@ -4012,32 +4007,43 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse sierveu waibe"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Sierveu waibe sol rantoele locåle:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Sierveu waibe sol daegntoele:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "Ridant di l' uzeu:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Li macrea a-st apontyî comifåt vosse sierveu waibe pol rantoele locåle eyet "
 "pol daegntoele"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Sierveu waibe apache"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr ""
+#~ "Li comande est co en alaedje. El voloz vs touwer eyet cwiter l' macrea?"
+
+#~ msgid "Close"
+#~ msgstr "Clôre"
+
+#~ msgid "Slave kolab server"
+#~ msgstr "Sierveu kolab esclåve"
+
 #~ msgid "Mail domain:"
 #~ msgstr "Dominne d' emilreye:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 34eed95a..2d72152c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-09-04 14:26+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -24,8 +24,8 @@ msgstr "配置向导"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "警告。"
 
@@ -37,17 +37,17 @@ msgstr "出错。"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -118,42 +118,42 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "出错"
 
@@ -213,15 +213,6 @@ msgstr ""
 "localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行调"
 "整。"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "命令仍在运行。您是否想要杀死它然后退出向导?"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "关闭"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP 向导"
@@ -304,8 +295,8 @@ msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "已禁用"
 
@@ -313,8 +304,8 @@ msgstr "已禁用"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "已启用"
 
@@ -332,13 +323,13 @@ msgstr "向导成功地配置了 DHCP 服务。"
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "失败"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新调用配置向导，然后试着更新一些参数。"
 
@@ -636,19 +627,24 @@ msgstr "新闻组服务器"
 msgid "NFS server"
 msgstr "NFS 服务器"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab 服务器"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "选择 Drakwizard 向导"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "请选择一个向导"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -657,7 +653,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -915,10 +911,6 @@ msgstr "Kolab 配置向导"
 msgid "Master kolab server"
 msgstr "主 kolab 服务器"
 
-#: ../kolab_wizard/Kolab.pm:61
-msgid "Slave kolab server"
-msgstr "从 kolab 服务器"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -947,11 +939,11 @@ msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 msgid "Master or slave Kolab server"
 msgstr "主或从 Kolab 服务器"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr "您选择了主 Kolab 服务器"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
@@ -959,11 +951,11 @@ msgstr ""
 "输入从 kolab 服务器的全称主机名，如 thishost.domain.tld (如果没有的话，请留"
 "空)。"
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid "You choose to configure a master Kolab server."
 msgstr "您选择配置主 Kolab 服务器。"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 msgid "Slave kolab server:"
 msgstr "从 kolab 服务器:"
 
@@ -1038,8 +1030,13 @@ msgid ""
 msgstr "如果您的 Kolab 服务器已经有 CA 和证书的话，可以选择跳过此步。"
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
-msgstr "请输入 CA 的密码句，以及 RSA 密钥的密码句。"
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
+msgstr ""
+"Kolab 可以创建并管理证书颁发中心，您可以使用该中心创建在 Kolab 环境内使用的 "
+"SSL 证书。请输入证书颁发中心的密码句，以及 RSA 密钥的密码句。"
 
 #: ../kolab_wizard/Kolab.pm:185
 msgid "CA passphrase:"
@@ -1071,21 +1068,21 @@ msgid "With CA"
 msgstr "带 CA"
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr "完成"
+
+#: ../kolab_wizard/Kolab.pm:219
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "kolab 服务器现已配置并运行起来了。请在 https://127.0.0.1/kolab/admin/ 以用户"
 "名“manager”及您输入的密码登录"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab 服务器"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Ldap 向导"
@@ -1421,7 +1418,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "您输入的路径不存在。"
 
@@ -1682,15 +1679,15 @@ msgstr "主 Postfix 服务器"
 #: ../postfix_wizard/Postfix.pm:172
 msgid ""
 "Verify command: this stops some techniques used to harvest email addresses."
-msgstr ""
-"校验命令: 这将停用某些用于验证电子邮件地址的技术。"
+msgstr "校验命令: 这将停用某些用于验证电子邮件地址的技术。"
 
 #: ../postfix_wizard/Postfix.pm:172
 msgid ""
 "helo_required: require that a remote SMTP client introduces itself at the "
 "beginning of an SMTP session with the HELO or EHLO command."
 msgstr ""
-"helo_required: 需要远程 SMTP 客户端在 SMTP 会话开始的时候使用 HELO 或 EHLO 命令。"
+"helo_required: 需要远程 SMTP 客户端在 SMTP 会话开始的时候使用 HELO 或 EHLO 命"
+"令。"
 
 #: ../postfix_wizard/Postfix.pm:179
 msgid "helo required:"
@@ -2035,7 +2032,7 @@ msgid ""
 msgstr "为了配置您的代理服务器，向导收集了下列需要的参数:"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3069,9 +3066,9 @@ msgid ""
 "list will be able to do anything they like on the share, irrespective of "
 "file permissions."
 msgstr ""
-"这里列出了将在共享上被赋予管理权限的用户。这意味着这些用户将可以执行所有文件操作，"
-"与超级用户(root)一样。您应该小心使用此选项，因为此列表中的任何用户都可以在共享进行"
-"他想要执行的任何操作，而与文件权限无关。"
+"这里列出了将在共享上被赋予管理权限的用户。这意味着这些用户将可以执行所有文件"
+"操作，与超级用户(root)一样。您应该小心使用此选项，因为此列表中的任何用户都可"
+"以在共享进行他想要执行的任何操作，而与文件权限无关。"
 
 #: ../samba_wizard/Sambashare.pm:274
 msgid "admin users"
@@ -3087,8 +3084,8 @@ msgid ""
 "Samba. Any file matching this pattern will be treated as a hidden file from "
 "the perspective of the client. ie: /.icewm/"
 msgstr ""
-"隐藏文件选项为 Samba 提供了一个或多个目录或文件名模式。与此模式匹配的任何文件都将"
-"被认为是隐藏文件，从而无法在客户端看见。如: /.icewm/"
+"隐藏文件选项为 Samba 提供了一个或多个目录或文件名模式。与此模式匹配的任何文件"
+"都将被认为是隐藏文件，从而无法在客户端看见。如: /.icewm/"
 
 #: ../samba_wizard/Sambashare.pm:276 ../samba_wizard/Sambashare.pm:478
 #: ../samba_wizard/Sambashare.pm:591
@@ -3123,9 +3120,9 @@ msgid ""
 "permissions changed. The default for this parameter is (in octal) 000. ie: "
 "force create mode = 0700 "
 msgstr ""
-"此参数指定了一组 UNIX 模式位权限，该权限将自动设定到由 Samba 创建的任何文件上。"
-"在创建文件或更改文件权限时，这一组权限将与文件的模式位进行逻辑或操作。此参数的"
-"默认值(八进制)为 000。如: 强制创建模式 = 0700"
+"此参数指定了一组 UNIX 模式位权限，该权限将自动设定到由 Samba 创建的任何文件"
+"上。在创建文件或更改文件权限时，这一组权限将与文件的模式位进行逻辑或操作。此"
+"参数的默认值(八进制)为 000。如: 强制创建模式 = 0700"
 
 #: ../samba_wizard/Sambashare.pm:306
 msgid "force create mode"
@@ -3139,9 +3136,10 @@ msgid ""
 "default for this parameter is (in octal) 0000 which will not add any extra "
 "permission bits to a created directory. ie: force directory mode = 0755"
 msgstr ""
-"此参数指定了一组 UNIX 模式位权限，该权限将自动设定到由 Samba 创建的任何目录上。"
-"在创建目录时，这一组权限将与文件的模式位进行逻辑或操作。此参数的默认值(八进制)"
-"为 000，这代表不会在创建的目录上添加任何额外的权限位。如: 强制目录模式 = 0755"
+"此参数指定了一组 UNIX 模式位权限，该权限将自动设定到由 Samba 创建的任何目录"
+"上。在创建目录时，这一组权限将与文件的模式位进行逻辑或操作。此参数的默认值(八"
+"进制)为 000，这代表不会在创建的目录上添加任何额外的权限位。如: 强制目录模式 "
+"= 0755"
 
 #: ../samba_wizard/Sambashare.pm:307
 msgid "force directory mode"
@@ -3154,8 +3152,8 @@ msgid ""
 "sharing files by ensuring that all access to files on service will use the "
 "named group for their permissions checking. ie: force group = agroup"
 msgstr ""
-"此参数指定了将为连接到此服务的所有用户指派的默认 UNIX 主组。"
-"这在使用命名组进行权限检查再访问共享文件时非常有用。强制组 = agroup"
+"此参数指定了将为连接到此服务的所有用户指派的默认 UNIX 主组。这在使用命名组进"
+"行权限检查再访问共享文件时非常有用。强制组 = agroup"
 
 #: ../samba_wizard/Sambashare.pm:308
 msgid "force group"
@@ -3184,8 +3182,7 @@ msgstr "保留大小写"
 msgid ""
 "Create mask, force directory mode and force create mode should be numeric. "
 "ie: 0755."
-msgstr ""
-"创建掩码，强制目录模式和强制创建模式必须是数字。如: 0755。"
+msgstr "创建掩码，强制目录模式和强制创建模式必须是数字。如: 0755。"
 
 #: ../samba_wizard/Sambashare.pm:322 ../samba_wizard/Sambashare.pm:465
 msgid "Add a share"
@@ -3208,8 +3205,7 @@ msgstr "可写: 用户可对该共享写入"
 msgid ""
 "Share with the same name already exist or share name empty, please choose "
 "another name."
-msgstr ""
-"已经存在同名共享，或者共享名称为空，请另外选择一个名称。"
+msgstr "已经存在同名共享，或者共享名称为空，请另外选择一个名称。"
 
 #: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:344
 #: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:409
@@ -3251,8 +3247,8 @@ msgid ""
 "Be careful, you define your public share writable. This wizard will change "
 "permission to nobody.users, so do not use this feature on a home directory !"
 msgstr ""
-"请小心，您将您的公开共享定义为可写。此向导将会将权限更改为 nobody.users，"
-"所以请不要在主目录中使用此特性!"
+"请小心，您将您的公开共享定义为可写。此向导将会将权限更改为 nobody.users，所以"
+"请不要在主目录中使用此特性!"
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
@@ -3266,8 +3262,7 @@ msgstr "如果您不想使用此选项，请将其留空。"
 msgid ""
 "Specifies a list of users that have read-only access to a writable share. "
 "ie: aginies"
-msgstr ""
-"指定在可写共享上拥有只读权限的用户列表。如: aginies"
+msgstr "指定在可写共享上拥有只读权限的用户列表。如: aginies"
 
 #: ../samba_wizard/Sambashare.pm:476
 msgid "Specifies a user that have read-write access to a share. ie: guibo"
@@ -3526,8 +3521,8 @@ msgid ""
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
-"如果用户在指定时间内尚未登录成功，则服务器将断开连接。如果此值为 0，则代表"
-"没有时间限制。默认值为 120 秒。"
+"如果用户在指定时间内尚未登录成功，则服务器将断开连接。如果此值为 0，则代表没"
+"有时间限制。默认值为 120 秒。"
 
 #: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
@@ -3552,9 +3547,9 @@ msgid ""
 "normally desirable because novices sometimes accidentally leave their "
 "directory or files world-writable"
 msgstr ""
-"严格模式: 指定 sshd 是否应在接受登录前先检查用户文件和主目录的文件模式和所有权。"
-"大多数系统管理都会需要此特性，因为新手经常将他们的目录或文件不小心设置为任何人可"
-"写。"
+"严格模式: 指定 sshd 是否应在接受登录前先检查用户文件和主目录的文件模式和所有"
+"权。大多数系统管理都会需要此特性，因为新手经常将他们的目录或文件不小心设置为"
+"任何人可写。"
 
 #: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
@@ -3572,8 +3567,7 @@ msgstr "允许用户:"
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
-msgstr ""
-"如果指定的话，只允许指定的用户登录。如: erwan aginies guibo"
+msgstr "如果指定的话，只允许指定的用户登录。如: erwan aginies guibo"
 
 #: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
@@ -3583,8 +3577,7 @@ msgstr "禁止的用户:"
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
-msgstr ""
-"禁止列出的用户登录。如: pirate guillomovitch"
+msgstr "禁止列出的用户登录。如: pirate guillomovitch"
 
 #: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
@@ -3596,8 +3589,8 @@ msgid ""
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
-"X11 转发：指定是否允许 X11 转发。请注意禁用 X11 转发无法阻止用户转发 X11 流量，"
-"因为用户总可以安装自己的转发器。"
+"X11 转发：指定是否允许 X11 转发。请注意禁用 X11 转发无法阻止用户转发 X11 流"
+"量，因为用户总可以安装自己的转发器。"
 
 #: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
@@ -3623,33 +3616,33 @@ msgstr "正在配置您的 OpenSSH 服务器..."
 msgid "OpenSSH server"
 msgstr "OpenSSH 服务器"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "时间向导"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "再试一次"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "不经测试保存配置"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr "此向导将帮助您配置您服务器的时间，与一个外部时间服务器同步。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "这样您到服务器将成为您局域网上的时间服务器。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "点击“下一步”开始，或“取消”离开此向导"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3657,80 +3650,80 @@ msgstr ""
 "(我们推荐您使用两个都使用 pool.ntp.org，因为此服务器会随机指向可用的时间服务"
 "器)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "从列表中选择一个主服务器和一个辅服务器:"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "时间服务器"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "主时间服务器:"
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "辅时间服务器:"
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "选择一个时区"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "选择一个区域:"
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "选择一个城市:"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 "如果由于网络或其他原因，不能马上连接到时间服务器，您可能要等待 30 秒钟。"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "点击“下一步”开始测试时间服务器。"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "测试时间服务器是否可用"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "时区:"
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "时间服务器没有响应。原因可能是:"
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- 没有时间服务器"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- 没有外部网络"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- 其它原因..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr "- 您可以再次尝试连接时间服务器，或保存配置而不实际设定时间。"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "时间服务器配置已保存"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "您的服务器现在可以对您的局域网提供时间服务。"
 
@@ -3771,15 +3764,15 @@ msgstr ""
 "您的服务器可以在您的网络(Intranet)上作为 Web 服务器，也可以对 Internet 提供 "
 "Web 服务。"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "启用 Intranet 用的 Web 服务器"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "启用 Internet 用的 Web 服务器"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3788,11 +3781,11 @@ msgstr ""
 "* 用户模块: 允许用户在其主目录中获得一个目录，通过您服务器上的 http://www."
 "yourserver.com/~user 进行访问。您稍候将会被问到此目录的名称。"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "模块:"
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3800,7 +3793,7 @@ msgstr ""
 "允许用户在其主目录中获得一个目录，通过您服务器上的http://www.yourserver.com/"
 "~user 进行访问。"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3808,52 +3801,52 @@ msgstr ""
 "请输入用户应该在其主目录中创建的目录名(不包括~/)，这样就可以通过 http://www."
 "yourserver.com/~user 访问"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 msgid "You must specify a user directory."
 msgstr "您必须指定用户目录。"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "使用 http 子目录: ~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "输入您想要做为文档根的目录路径。"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "文档根:"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "配置 Web 服务器"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "为了配置您的 WEB 服务器，向导收集了下列需要的参数:"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "Intranet Web 服务器:"
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "Internet Web 服务器:"
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "用户目录:"
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "向导成功地配置了您的 Intranet/Internet Web 服务器"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache 服务器"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8c2c8eab..10cd36fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-05 13:39+0200\n"
+"POT-Creation-Date: 2005-09-09 02:28+0800\n"
 "PO-Revision-Date: 2005-07-16 01:42+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -24,8 +24,8 @@ msgstr "設定精靈"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:135 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:88 ../proxy_wizard/Squid.pm:95
-#: ../time_wizard/Ntp.pm:125 ../time_wizard/Ntp.pm:132
-#: ../web_wizard/Apache.pm:86
+#: ../time_wizard/Ntp.pm:128 ../time_wizard/Ntp.pm:135
+#: ../web_wizard/Apache.pm:90
 msgid "Warning."
 msgstr "警告。"
 
@@ -37,17 +37,17 @@ msgstr "錯誤。"
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
 #: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
 #: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
-#: ../ftp_wizard/Proftpd.pm:167 ../kolab_wizard/Kolab.pm:219
-#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
-#: ../postfix_wizard/Postfix.pm:268 ../proxy_wizard/Squid.pm:179
-#: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
-#: ../pxe_wizard/Pxe.pm:324 ../samba_wizard/Samba.pm:346
-#: ../samba_wizard/Sambaprint.pm:147 ../samba_wizard/Sambashare.pm:646
-#: ../samba_wizard/Sambashare.pm:654 ../samba_wizard/Sambashare.pm:659
-#: ../samba_wizard/Sambashare.pm:664 ../samba_wizard/Sambashare.pm:669
-#: ../samba_wizard/Sambashare.pm:674 ../samba_wizard/Sambashare.pm:679
-#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:145
+#: ../ftp_wizard/Proftpd.pm:167 ../ldap_wizard/Ldap.pm:238
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
+#: ../nisautofs_wizard/Nisautofs.pm:113 ../postfix_wizard/Postfix.pm:268
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:346 ../samba_wizard/Sambaprint.pm:147
+#: ../samba_wizard/Sambashare.pm:646 ../samba_wizard/Sambashare.pm:654
+#: ../samba_wizard/Sambashare.pm:659 ../samba_wizard/Sambashare.pm:664
+#: ../samba_wizard/Sambashare.pm:669 ../samba_wizard/Sambashare.pm:674
+#: ../samba_wizard/Sambashare.pm:679 ../sshd_wizard/Sshd.pm:189
+#: ../web_wizard/Apache.pm:149
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -120,42 +120,42 @@ msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:90
 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:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:86
-#: ../drakwizard.pl:112 ../drakwizard.pl:163 ../drakwizard.pl:167
-#: ../ftp_wizard/Proftpd.pm:91 ../ftp_wizard/Proftpd.pm:110
-#: ../ftp_wizard/Proftpd.pm:113 ../ftp_wizard/Proftpd.pm:131
-#: ../kolab_wizard/Kolab.pm:108 ../kolab_wizard/Kolab.pm:143
-#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
-#: ../ldap_wizard/Ldap.pm:144 ../ldap_wizard/Ldap.pm:148
-#: ../ldap_wizard/Ldap.pm:152 ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:196
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:205
-#: ../nfs_wizard/NFS.pm:62 ../postfix_wizard/Postfix.pm:164
-#: ../postfix_wizard/Postfix.pm:166 ../postfix_wizard/Postfix.pm:168
-#: ../postfix_wizard/Postfix.pm:185 ../postfix_wizard/Postfix.pm:201
-#: ../postfix_wizard/Postfix.pm:219 ../samba_wizard/Samba.pm:151
-#: ../samba_wizard/Samba.pm:181 ../samba_wizard/Samba.pm:225
-#: ../samba_wizard/Samba.pm:266 ../samba_wizard/Samba.pm:270
-#: ../samba_wizard/Samba.pm:274 ../samba_wizard/Samba.pm:278
-#: ../samba_wizard/Samba.pm:295 ../samba_wizard/Samba.pm:311
-#: ../samba_wizard/Sambashare.pm:210 ../samba_wizard/Sambashare.pm:233
-#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:398 ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:415 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:452 ../samba_wizard/Sambashare.pm:455
-#: ../samba_wizard/Sambashare.pm:458 ../samba_wizard/Sambashare.pm:485
-#: ../samba_wizard/Sambashare.pm:491 ../samba_wizard/Sambashare.pm:521
-#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
-#: ../sshd_wizard/Sshd.pm:90 ../sshd_wizard/Sshd.pm:147
-#: ../web_wizard/Apache.pm:109 ../web_wizard/Apache.pm:124
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:87
+#: ../drakwizard.pl:113 ../drakwizard.pl:168 ../ftp_wizard/Proftpd.pm:91
+#: ../ftp_wizard/Proftpd.pm:110 ../ftp_wizard/Proftpd.pm:113
+#: ../ftp_wizard/Proftpd.pm:131 ../kolab_wizard/Kolab.pm:108
+#: ../kolab_wizard/Kolab.pm:143 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:166
+#: ../postfix_wizard/Postfix.pm:168 ../postfix_wizard/Postfix.pm:185
+#: ../postfix_wizard/Postfix.pm:201 ../postfix_wizard/Postfix.pm:219
+#: ../samba_wizard/Samba.pm:151 ../samba_wizard/Samba.pm:181
+#: ../samba_wizard/Samba.pm:225 ../samba_wizard/Samba.pm:266
+#: ../samba_wizard/Samba.pm:270 ../samba_wizard/Samba.pm:274
+#: ../samba_wizard/Samba.pm:278 ../samba_wizard/Samba.pm:295
+#: ../samba_wizard/Samba.pm:311 ../samba_wizard/Sambashare.pm:210
+#: ../samba_wizard/Sambashare.pm:233 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:315 ../samba_wizard/Sambashare.pm:333
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:341
+#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:409 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:444 ../samba_wizard/Sambashare.pm:452
+#: ../samba_wizard/Sambashare.pm:455 ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:485 ../samba_wizard/Sambashare.pm:491
+#: ../samba_wizard/Sambashare.pm:521 ../samba_wizard/Sambashare.pm:772
+#: ../samba_wizard/Sambashare.pm:938 ../sshd_wizard/Sshd.pm:90
+#: ../sshd_wizard/Sshd.pm:147 ../web_wizard/Apache.pm:113
+#: ../web_wizard/Apache.pm:128
 msgid "Error"
 msgstr "錯誤"
 
@@ -213,15 +213,6 @@ msgstr ""
 "或空白的正確網域名稱。主機名稱必須為 FQDN：完整領域名稱。i請啟動 drakconnect "
 "來調整它。"
 
-#: ../common/Wizcommon_gtk2.pm:95
-msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "命令仍在執行中。您要強制停止並且離開精靈？"
-
-#: ../common/Wizcommon_gtk2.pm:112
-msgid "Close"
-msgstr "關閉"
-
 #: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "DHCP 精靈"
@@ -304,8 +295,8 @@ msgstr "精靈收集到以下需要設定您的 DHCP 服務的參數:"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "disabled"
 msgstr "已關閉"
 
@@ -313,8 +304,8 @@ msgstr "已關閉"
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
 #: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
 #: ../ftp_wizard/Proftpd.pm:152 ../installsrv_wizard/Installsrv.pm:88
-#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
+#: ../installsrv_wizard/Installsrv.pm:89 ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:137
 msgid "enabled"
 msgstr "已啟用"
 
@@ -332,13 +323,13 @@ msgstr "本精靈已經成功地設定了 DHCP 服務。"
 #: ../postfix_wizard/Postfix.pm:277 ../proxy_wizard/Squid.pm:184
 #: ../pxe_wizard/Pxe.pm:331 ../samba_wizard/Samba.pm:355
 #: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
-#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:150
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:154
 msgid "Failed"
 msgstr "失敗"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
-#: ../web_wizard/Apache.pm:151
+#: ../web_wizard/Apache.pm:155
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新啟動 drakwizard，且試著改變某些參數。"
 
@@ -635,19 +626,24 @@ msgstr "新聞伺服器"
 msgid "NFS server"
 msgstr "NFS 伺服器"
 
-#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../kolab_wizard/Kolab.pm:236
+#: ../kolab_wizard/Kolab.pm:244
+msgid "Kolab server"
+msgstr "Kolab 伺服器"
+
+#: ../drakwizard.pl:62 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../drakwizard.pl:74
+#: ../drakwizard.pl:75
 msgid "Drakwizard wizard selection"
 msgstr "Drakwizard 精靈選擇"
 
-#: ../drakwizard.pl:75
+#: ../drakwizard.pl:76
 msgid "Please select a wizard"
 msgstr "請選擇精靈"
 
-#: ../drakwizard.pl:163
+#: ../drakwizard.pl:164
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -656,7 +652,7 @@ msgstr ""
 "%s 沒有安裝\n"
 "要安裝點選 \"Next 下一步\" 或 \"Cancel 取消\" 離開"
 
-#: ../drakwizard.pl:167
+#: ../drakwizard.pl:168
 msgid "Installation failed"
 msgstr "安裝失敗"
 
@@ -917,11 +913,6 @@ msgstr "Kolab 設定精靈"
 msgid "Master kolab server"
 msgstr "主要 DNS 伺服器"
 
-#: ../kolab_wizard/Kolab.pm:61
-#, fuzzy
-msgid "Slave kolab server"
-msgstr "次要 DNS 伺服器"
-
 #: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
@@ -951,22 +942,22 @@ msgstr "歡迎使用 Kolab 群組軟體伺服器設定精靈。"
 msgid "Master or slave Kolab server"
 msgstr "主要 DNS 伺服器"
 
-#: ../kolab_wizard/Kolab.pm:87
+#: ../kolab_wizard/Kolab.pm:86
 msgid "You choose a Master Kolab server"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 msgid ""
 "Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
 "tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
+#: ../kolab_wizard/Kolab.pm:90
 #, fuzzy
 msgid "You choose to configure a master Kolab server."
 msgstr "您已經設定了您的 LDAP 伺服器"
 
-#: ../kolab_wizard/Kolab.pm:93
+#: ../kolab_wizard/Kolab.pm:92
 #, fuzzy
 msgid "Slave kolab server:"
 msgstr "次要 DNS 伺服器"
@@ -1042,7 +1033,10 @@ msgid ""
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:168
-msgid "Enter the passphrase for CA, and the passphrase for the RSA key."
+msgid ""
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment. Enter the "
+"passphrase for CA, and the passphrase for the RSA key."
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:185
@@ -1076,21 +1070,22 @@ msgid "With CA"
 msgstr ""
 
 #: ../kolab_wizard/Kolab.pm:219
+msgid "Done"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:219
+#, fuzzy
 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/"
+"The kolab server is now configured. Log in as 'manager' with the password "
+"you entered at https://127.0.0.1/kolab/admin/"
 msgstr ""
 "Kolab 伺服器已經設定完成並執行。請以 'manager' 帳號並配合您在 "
 "https://127.0.0.1/kolab/admin/ 輸入的密碼登入"
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:244
 msgid "Configuring Kolab server on your system..."
 msgstr "正在設定您的 Kolab 伺服器..."
 
-#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
-msgid "Kolab server"
-msgstr "Kolab 伺服器"
-
 #: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "LDAP 精靈"
@@ -1426,7 +1421,7 @@ msgstr ""
 msgid "Directory:"
 msgstr "目錄："
 
-#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:124
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:128
 msgid "The path you entered does not exist."
 msgstr "您輸入的路徑不存在。"
 
@@ -2053,7 +2048,7 @@ msgid ""
 msgstr "精靈收集到以下設定您的代理伺服器所需的參數："
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:130
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:134
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -3668,33 +3663,33 @@ msgstr "正在設定您的 OpenSSH 伺服器..."
 msgid "OpenSSH server"
 msgstr "OpenSSH 伺服器"
 
-#: ../time_wizard/Ntp.pm:35
+#: ../time_wizard/Ntp.pm:36
 msgid "Time wizard"
 msgstr "時間精靈"
 
-#: ../time_wizard/Ntp.pm:48
+#: ../time_wizard/Ntp.pm:51
 msgid "Try again"
 msgstr "再試一次"
 
-#: ../time_wizard/Ntp.pm:49
+#: ../time_wizard/Ntp.pm:52
 msgid "Save config without test"
 msgstr "不測試直接儲存設定"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
 msgstr "本精靈將協助您設定您的伺服器與一外部時間伺服器進行時間的同步。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "Thus your server will be the local time server for your network."
 msgstr "如此一來您的伺服器將會是您網路中的本地端時間伺服器。"
 
-#: ../time_wizard/Ntp.pm:70
+#: ../time_wizard/Ntp.pm:73
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr "按下一步開始，或取消離開本精靈"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid ""
 "(we recommend using the server pool.ntp.org twice as this server randomly "
 "points to available time servers)"
@@ -3702,80 +3697,80 @@ msgstr ""
 "(我們建議使用 pool.ntp.org 伺服器兩次，因為這個伺服器會隨機的指向可用的伺服"
 "器)"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Select a primary and secondary server from the list."
 msgstr "從列表中選擇一個主和次伺服器。"
 
-#: ../time_wizard/Ntp.pm:75
+#: ../time_wizard/Ntp.pm:78
 msgid "Time servers"
 msgstr "時間伺服器"
 
-#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:84 ../time_wizard/Ntp.pm:121
 msgid "Primary time server:"
 msgstr "主時間伺服器："
 
-#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:85 ../time_wizard/Ntp.pm:122
 msgid "Secondary time server:"
 msgstr "次時間伺服器："
 
-#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:90 ../time_wizard/Ntp.pm:105
 msgid "Choose a timezone"
 msgstr "選擇時區"
 
-#: ../time_wizard/Ntp.pm:94
+#: ../time_wizard/Ntp.pm:97
 msgid "Choose a region:"
 msgstr "選擇地區："
 
-#: ../time_wizard/Ntp.pm:107
+#: ../time_wizard/Ntp.pm:110
 msgid "Choose a city:"
 msgstr "選擇城市："
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
 "如果時間伺服器不能立即使用 (因為網路或其他因素)，大約會有 30 秒的延遲。"
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Press next to start the time servers test."
 msgstr "按下一步開始時間伺服器測試."
 
-#: ../time_wizard/Ntp.pm:112
+#: ../time_wizard/Ntp.pm:115
 msgid "Testing the time servers availability"
 msgstr "測試時間伺服器的有效性中"
 
-#: ../time_wizard/Ntp.pm:120
+#: ../time_wizard/Ntp.pm:123
 msgid "Time zone:"
 msgstr "時區："
 
-#: ../time_wizard/Ntp.pm:133
+#: ../time_wizard/Ntp.pm:136
 msgid "The time servers are not responding. The causes could be:"
 msgstr "時間伺服器沒有回應。原因可能是："
 
-#: ../time_wizard/Ntp.pm:134
+#: ../time_wizard/Ntp.pm:137
 msgid "- non existent time servers"
 msgstr "- 時間伺服器不存在"
 
-#: ../time_wizard/Ntp.pm:135
+#: ../time_wizard/Ntp.pm:138
 msgid "- no outside network"
 msgstr "- 沒有外部網路"
 
-#: ../time_wizard/Ntp.pm:136
+#: ../time_wizard/Ntp.pm:139
 msgid "- other reasons..."
 msgstr "- 其他原因..."
 
-#: ../time_wizard/Ntp.pm:137
+#: ../time_wizard/Ntp.pm:140
 msgid ""
 "- You can try again to contact time servers, or save configuration without "
 "actually setting time."
 msgstr "- 您可以重新嘗試聯絡時間伺服器，或在沒有實際設定時間的情況下儲存設定。"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Time server configuration saved"
 msgstr "時間伺服器設定已儲存"
 
-#: ../time_wizard/Ntp.pm:153
+#: ../time_wizard/Ntp.pm:156
 msgid "Your server can now act as a time server for your local network."
 msgstr "您的伺服器現在可作為您的本地端網路的時間伺服器。"
 
@@ -3814,15 +3809,15 @@ msgid ""
 "and as a Web server for the Internet."
 msgstr "您的伺服器能作為您內部網路 (區域網路) 與網際網路的網頁伺服器。"
 
-#: ../web_wizard/Apache.pm:80
+#: ../web_wizard/Apache.pm:84
 msgid "Enable the Web server for the intranet"
 msgstr "啟用區域網路的網頁伺服器"
 
-#: ../web_wizard/Apache.pm:81
+#: ../web_wizard/Apache.pm:85
 msgid "Enable the Web server for the Internet"
 msgstr "啟用網際網路的網頁伺服器"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid ""
 "* User module: allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
@@ -3831,11 +3826,11 @@ msgstr ""
 "* 使用者模組：允許使用者在家目錄中擁有一個可以經由 HTTP 伺服器，透過 http://"
 "www.yourserver.com/~user 使用的目錄。您稍候將被詢問此目錄的名字。"
 
-#: ../web_wizard/Apache.pm:91
+#: ../web_wizard/Apache.pm:95
 msgid "Modules:"
 msgstr "模組："
 
-#: ../web_wizard/Apache.pm:94
+#: ../web_wizard/Apache.pm:98
 msgid ""
 "Allows users to get a directory in their home directories available on your "
 "http server via http://www.yourserver.com/~user."
@@ -3843,7 +3838,7 @@ msgstr ""
 "允許使用者在家目錄中建立一個可以在您的 HTTP 伺服器上藉由 http://www."
 "yourserver.com/~user 連線的目錄。"
 
-#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:104 ../web_wizard/Apache.pm:116
 msgid ""
 "Type the name of the directory users should create in their homes (without "
 "~/) to get it available via http://www.yourserver.com/~user"
@@ -3851,57 +3846,68 @@ msgstr ""
 "輸入使用者要在自己家目錄中建立來供 http://www.yourserver.com/~user 使用的目錄"
 "名稱 (不包含 ~/)。"
 
-#: ../web_wizard/Apache.pm:109
+#: ../web_wizard/Apache.pm:113
 #, fuzzy
 msgid "You must specify a user directory."
 msgstr "您必須先設定一個 LDAP 伺服器。"
 
-#: ../web_wizard/Apache.pm:112
+#: ../web_wizard/Apache.pm:116
 msgid "user http sub-directory: ~/"
 msgstr "使用者的 HTTP 子目錄：~/"
 
-#: ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:121
 msgid "Type the path of the directory you want being the document root."
 msgstr "輸入您要用來作為說明文件目錄的路徑。"
 
-#: ../web_wizard/Apache.pm:120 ../web_wizard/Apache.pm:138
+#: ../web_wizard/Apache.pm:124 ../web_wizard/Apache.pm:142
 msgid "Document root:"
 msgstr "說明文件目錄："
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid "Configuring the Web server"
 msgstr "設定網頁伺服器中"
 
-#: ../web_wizard/Apache.pm:130
+#: ../web_wizard/Apache.pm:134
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "server"
 msgstr "精靈收集到以下需要設定您的網頁伺服器的參數"
 
-#: ../web_wizard/Apache.pm:136
+#: ../web_wizard/Apache.pm:140
 msgid "Intranet web server:"
 msgstr "區域網路網頁伺服器："
 
-#: ../web_wizard/Apache.pm:137
+#: ../web_wizard/Apache.pm:141
 msgid "Internet web server:"
 msgstr "網際網路網頁伺服器："
 
-#: ../web_wizard/Apache.pm:139
+#: ../web_wizard/Apache.pm:143
 msgid "User directory:"
 msgstr "使用者目錄："
 
-#: ../web_wizard/Apache.pm:145
+#: ../web_wizard/Apache.pm:149
 msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "本精靈已經成功地設定您的區域網路/網際網路網頁伺服器"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Apache server"
 msgstr "Apache 伺服器"
 
-#: ../web_wizard/Apache.pm:249
+#: ../web_wizard/Apache.pm:253
 msgid "Configuring your system as Apache server ..."
 msgstr "正在設定您的系統成為 Apache 伺服器 ..."
 
+#~ msgid ""
+#~ "The command is still running. Do you want to kill it and quit the Wizard?"
+#~ msgstr "命令仍在執行中。您要強制停止並且離開精靈？"
+
+#~ msgid "Close"
+#~ msgstr "關閉"
+
+#, fuzzy
+#~ msgid "Slave kolab server"
+#~ msgstr "次要 DNS 伺服器"
+
 #~ msgid "Mail domain:"
 #~ msgstr "電子郵件網域："